From patchwork Fri Jun 24 02:45:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893317 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7ED88CCA47C for ; Fri, 24 Jun 2022 02:45:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230048AbiFXCpO (ORCPT ); Thu, 23 Jun 2022 22:45:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229923AbiFXCpN (ORCPT ); Thu, 23 Jun 2022 22:45:13 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D592F522D3; Thu, 23 Jun 2022 19:45:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038712; x=1687574712; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=dRj4P82OnytqCwrJAeegbI/5GTXNErF9xp1XTUwfQzA=; b=OhFcx9CMmbMUub1//mJAPju7aURCES9l6C09cjHDR7RuAUNKcXDXOpyz Jee2koTsAbPATdBPKsMN4jPAQ3GoSk8Z04eq4LvzH7mt/5UAljx/m0qbz ywzsxhDm8MndVkza91yKqhi23n/qV5XgVypAwNsrXPEHm8Fvglaqqtwew VhLQdNWMkufiRMnZEvOBo4ZDXx4j/SvKThFbo0WTeHRFg1Cxf2L6NgoMt jE81b+E71mnXLfTurT5R9YRP2AnYQlT3R6olqu1ls6FBERdCi+ZbIEHGl qILH04Gm4QbiqT9VF2LptKBUX2FSvdrjXcfQm/t5a4F6/HBHmzhJKkUfe w==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="306369860" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="306369860" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:45:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="678351319" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by FMSMGA003.fm.intel.com with ESMTP; 23 Jun 2022 19:45:12 -0700 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) by ORSMSX606.amr.corp.intel.com (10.22.229.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:45:12 -0700 Received: from orsmsx605.amr.corp.intel.com (10.22.229.18) by ORSMSX608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:45:11 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:45:11 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.106) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:45:11 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c1QLWKTDVnKvt7Eh5R73L0y8zM/sQh5oR0RTnfWcrflEzY9MfVsI6k60Y+Mfh/UALp+Yk7Mqx8pwHYCKMkKj3bom2sPgMSN9UZIYpMG8h45EwvIWqPisd237/EXGB5Y1YvpWP4IpoZH22XzKHYjwXO4S3lhIm6EXJlJXTqE5fmVk/TT83t3IiPboJKPxGLwk3nYdBFi5icVzRoL9l0qhheMZSQn02MHvODVusMMZeynbxrADj4k018gld2/yUUZzHsu6EN4d5ja65SosffvruGz32VYbK6wLQfi2qRXznHLOMBHPuuFdjdqqeGgUQ5LZrXqOc2XUDTdIcGfluecjcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=z9+5F/gXJ/1G9PFHiwabwJjHWmnQFfGv5UHF0uA7lNE=; b=HxJ6CqyVBM+qYZb7pwc1Z8wqJwV6uXsD2DmlgTT2v9yy5AnWVK73K3F/ZDONuk1bb6ZIaalgAuHP/oSK6qDsZDCScULU+DZTM6BNLszPsBsqJ07h9sWHpV/c/YfYo9ZLC0qFLkOdV7dX/TmEhNHTiMows4CSnviQswBmxRKUZWK98dWFV6csE4vra2UL1wapS1OahoCGWvG8M9JsOvrKpDkWjxJ0vLsP1KN9B0TgBLgkEwLHG7TpNKGKMfP1bNyRgAIvjExvlGYCzurnPji8+HSPJ9HpCw5N/Wcla5KKy7Tvn6DZpv0x431bJ0m0bsCXSfwxBX0kiGVvKxlVRFLPCA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by DM5PR11MB1993.namprd11.prod.outlook.com (2603:10b6:3:12::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.16; Fri, 24 Jun 2022 02:45:09 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:45:09 +0000 Date: Thu, 23 Jun 2022 19:45:07 -0700 From: Dan Williams To: CC: , , , , Subject: [PATCH 01/46] tools/testing/cxl: Fix cxl_hdm_decode_init() calling convention Message-ID: <165603870776.551046.8709990108936497723.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: CO2PR04CA0182.namprd04.prod.outlook.com (2603:10b6:104:5::12) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 57c2972c-4812-4f98-2201-08da558b8df4 X-MS-TrafficTypeDiagnostic: DM5PR11MB1993:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Zwo8vvfMQEwQMMYgGW5fQzNRhlAJv94HgG/tm1C8GvsASA3JEjh39UVTbghr8TyTt93FcuvJAa9rDCGdclyzO9aqUMp8rGllixoq1AD+714/9Ke2e3/MXDuga5dUuINpHrGoP9S19aAeyTTWQWiBL1/+95CKDt2vmw+GW2W6Isa+DourJHR01fmXZZ6zkOLaOzCMCnNZtWTKCfXbihTKoKTvnpg+JXhrGvT31QfsXCMswYrSix/eDqvjDDay7ozFrMXwPJOVkYKGcEvsOxT2gx6QNRxYbn/TDBGrj2f1Gl/SjdieHsKZxOTUF4QcvDtsqhkY5HcUXruMY8h9HKZ3XIn29w+yaZhSWOCaIaDOfE6s9MdgO0B6uVrvyvi6u912daLgW4ErOvLLMsvExVnUPNCyYYx8f295z7nrRkZzwLM2Y63ChlGpEc7ewe0QR+8sKkqhD7xqhd5fJkCY3Gz0Fn/UqF13KkZkXPUMxs9h6dwBwgo+yowaYmeKlJVJLLYW8C1qnKF+GjEgLKd5zxImr1jJV6ot2g+tJiaOApMugnsY8THeTW+HOlhMG2GBo5IMPAv3x6NzCZ8ky1pBtg2UX4YHmiqmcGV14Id2NWzg5MTxyDtbM9GX3Hgq3Vpd6O69+ujx7oXf25JXxY5HC50enV+6S1l9GF41rYQQ5w6w+bcg92DRp++5aLaAIzYKmRXzRWm+q2hFWNtB9RK01XqZTUaNisJlPfk3XVKFh1eXV3o= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(366004)(376002)(396003)(346002)(136003)(39860400002)(6506007)(6486002)(2906002)(41300700001)(478600001)(66476007)(316002)(9686003)(4326008)(103116003)(8676002)(66556008)(86362001)(33716001)(6916009)(66946007)(6512007)(26005)(83380400001)(38100700002)(8936002)(186003)(82960400001)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: l3TGmcFUQWD4z44/WE6oa4lvIj4hotjRGQAPGKPy5ktU1lbuF5IyOkkdjjq0Js52dN1T1jv+U1hGONKrQrJZFJ7lPOboSbFDAER3B0ko+60HlkuzyrKCt6GVSudf7tCUyWEDth48F2gJoV4G8D0ET+Sc9Feo2jMhD9nbLkPn/9sbST/yMCUZuyKko5Ib+1pg2/13/nKjQvG7aEud0MBJuhx4qi+WhjeFqlm6NbVxRIQO6htzFJnCHjKqBF2kyEGAdzC+8QAyZqZ0ClkjhC6Cqi3zYk//lLtUPyc+2/RV6cOWGvDPhHVgKO7Ds4Fkiohh5FO8tFJy80bRpDjm/ZdMOn629rgzP3mD4YmGR42mqbyeyg2anzjrP0VFcmlcuANnV9JWRv5Z2w5zkN94+oRT2kORL2q8litujP0wDP9+0UoT3LJtFrFW7BxTTJB1Cs+culS4NnQ0+et/PwF6RyOx0vTs2qCXUNMbHj84WAycAXadBRIFuof7Qi2Ma5AJdUelS/5MnUgiGQgGxoDCnbc4/CgQMJruVr+XJTw/z/seEUbEpSHxVQnC1PExDdgdiwfwW9NBxxOmv7jSmX3NP79dxPA5EgS+680Dl2+SHA/PchU90hvVuAJ/ULzObwx6bs+o33LIhll80Kualdup04ka1j7q1qeujKSqegZ53mOlRkAVsjjBTENj+aa0eUENMK9rCHbE057C6uwnoc18TGLi4f/X249wc1qbBLylPtZAV5hOOeWY2gNjdVzxGno89G3c+Dx1j8sz9Jl797bPW70ecOjfjZW4+N8HFl+iNOwEaW4+VIh0OQeCzAKLpduJK3JuAa5k56+zLJvZfaoFVyjXFe8uplt07T7BE06abP/jiKYKo9uim9rRsOu7jwC5H/HJr3/twL2TzgU2HPOxtZ5rcJZScxHROzNue5ZwIIVTFxhcrGpGFMa7QfvsNA5Vri3W0eDGrYdxzI9h2oUiszYW7h/LHRcmdJ1Hm1iQkgmtSNZoP+Ynpkne5qw1/BDE6AImqwzsu8z5rHm1vYpPdm+51qogioqxKdT4RpeY0xixkuBurJDiTj0DTuOHF5ML1qrmHil4xTJTrZedOx5vz815uyXlwhcKMMoAmZQA39cfnGlYfghFMbkaRbDLyhhv1QgDKrKolGZZwHRWJbB/zYuWkGA/rrSb1uq1pGbnc+NlbaF8xD7RB3XvymcxGG5kXFqGEuxTMIz2bwVpKgmRh8nxAtcAmIwma/LrcGq86jOcNYlxxjXbwLJOc0sJy9CeqBRD3iXAPFLE5Gmflmeh5KLviI8xNd2R0mYBPiWA+WL9FmtiLmnI0Ck8DVNR8XXmIBU5cRAD3z1JAYftgQXu89Dnp/PA+s9DeI0ugctpQ2bfmxGUjQChj1YTJ+nJLw2EaWZuH8mPES6nHaLVePYSIJBDsXfXtTYuMVRwYTWubgxHeWbwDeen0nTjHAiSng/HR0II3KSdxmqAS3N4BhU5R7wK89aWOfSrP2A1Iw5CFGwF/4MwdNrSeAj/IqYxZJVSnF/M32GzwCnsh4AXZrJzAzB6aboTEXdhUP2uGKzI7NiI0cuXxyIN76co5j5+BWheApMw2svnXPiD8VeSpsTuuaZYjA== X-MS-Exchange-CrossTenant-Network-Message-Id: 57c2972c-4812-4f98-2201-08da558b8df4 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:45:09.8154 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +RRNjwWsKa8ox89e4wk3x6Vqx6kdFTbq0u8FMdhC4qksUlQV/gyLjAVT2c0du/i6YEcvrj8a5F56ZDquDV3Jh8gqV/WOmwlxbXBsz1JliBg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR11MB1993 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This failing signature: [ 8.392669] cxl_bus_probe: cxl_port endpoint2: probe: 970997760 [ 8.392670] cxl_port: probe of endpoint2 failed with error 970997760 [ 8.392719] create_endpoint: cxl_mem mem0: add: endpoint2 [ 8.392721] cxl_mem mem0: endpoint2 failed probe [ 8.392725] cxl_bus_probe: cxl_mem mem0: probe: -6 ...shows cxl_hdm_decode_init() resulting in a return code ("970997760") that looks like stack corruption. The problem goes away if cxl_hdm_decode_init() is not mocked via __wrap_cxl_hdm_decode_init(). The corruption results from the mismatch that the calling convention for cxl_hdm_decode_init() is: int cxl_hdm_decode_init(struct cxl_dev_state *cxlds, struct cxl_hdm *cxlhdm) ...and __wrap_cxl_hdm_decode_init() is: bool __wrap_cxl_hdm_decode_init(struct cxl_dev_state *cxlds, struct cxl_hdm *cxlhdm) ...i.e. an int is expected but __wrap_hdm_decode_init() returns bool. Fix the convention and cleanup the organization to match __wrap_cxl_await_media_ready() as the difference was a red herring that distracted from finding the bug. Fixes: 92804edb11f0 ("cxl/pci: Drop @info argument to cxl_hdm_decode_init()") Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- tools/testing/cxl/test/mock.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/testing/cxl/test/mock.c b/tools/testing/cxl/test/mock.c index f1f8c40948c5..bce6a21df0d5 100644 --- a/tools/testing/cxl/test/mock.c +++ b/tools/testing/cxl/test/mock.c @@ -208,13 +208,15 @@ int __wrap_cxl_await_media_ready(struct cxl_dev_state *cxlds) } EXPORT_SYMBOL_NS_GPL(__wrap_cxl_await_media_ready, CXL); -bool __wrap_cxl_hdm_decode_init(struct cxl_dev_state *cxlds, - struct cxl_hdm *cxlhdm) +int __wrap_cxl_hdm_decode_init(struct cxl_dev_state *cxlds, + struct cxl_hdm *cxlhdm) { int rc = 0, index; struct cxl_mock_ops *ops = get_cxl_mock_ops(&index); - if (!ops || !ops->is_mock_dev(cxlds->dev)) + if (ops && ops->is_mock_dev(cxlds->dev)) + rc = 0; + else rc = cxl_hdm_decode_init(cxlds, cxlhdm); put_cxl_mock_ops(index); From patchwork Fri Jun 24 02:45:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893318 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 617FCCCA47C for ; Fri, 24 Jun 2022 02:45:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230061AbiFXCpW (ORCPT ); Thu, 23 Jun 2022 22:45:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229923AbiFXCpU (ORCPT ); Thu, 23 Jun 2022 22:45:20 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D2C056757; Thu, 23 Jun 2022 19:45:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038720; x=1687574720; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=N/JOWKmPpe5WKo3XhKj8F1LmPUZK/Z0aEj5Tw/CgYxY=; b=erSUCTuv23hw+JBsBjpm5MnBSzLndyfDYRJpI9CXPc+N6+Q1PZHG0otw EKGMxrgjEF907dWQrIaCV8UABLWjqny8BmiQbGnpYgpbA+9FYkQRFR1Ci LcrGstq7wknExHxadehKJyDPy6nqNs2n2zFYq6y1M3OhjqFIJNU0AEspb aAiEH+jfCtzhb438St797hDgoecUMhgiFyySb7q/AB+Dwt0XREJC0Z4RU kZqYWGcs0xnbaO9m4/O21FgIMOVQ+4TSwsbzgfWd0uxKbOPJA0y9RH+ja TFMM6WguqWJvqc8Xl31VnEwg+Pnhk22QmtXt8oKzqI1VWg2GxOyyWG1GA g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="260721924" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="260721924" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:45:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="834933150" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga006.fm.intel.com with ESMTP; 23 Jun 2022 19:45:19 -0700 Received: from fmsmsx606.amr.corp.intel.com (10.18.126.86) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:45:19 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:45:19 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.40) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:45:18 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Jq2UWMmaKuiYRsQXlSjXK7hapjovIwd6lI5uw8wvkUDBAxhLTPlo73nupqRO6C4vxOtUVOQWk0fG9P0Iu4EhV7RVt1M6Bh+WGsh/0Vh1YtfY1uo0woMP8ZcQPYSiNeRRdXeyeVnDf7G932yOWCyknTmr5YDnm1iU8EirXJdv6N3CPUQ7NDTDDrB4LPRAQlKz2Yw1mz9BbtSW0kWEGi64iZaK22cakdqmIuVN5DetDD8tu8fwmgNNA1D0Jip9VePDPoSgsufGswcQUPb/3IuLfCsru4eYhRzBNBWmx7YK+JtoJiuKCBBvGEaW/bsLzKW8P95oDpUKthIVMCxVPV7vWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ntl9wxR6g4xykERacCZePKsROjjbl6kQ/gOWEUt1qPE=; b=DW2ZrJTBnL1gZOwxa6IWw54HiQbqWqHllHFYhVDUMv2Y4pXxJFWWhoJs/vUS2Gaoj0GYNM4lvZVCZgDGFRPL7rhmIkMZMEvY6r+gwKQthhdJJGI1k2sF8xHubNbhNXHNWTqEhS7FjhiLVXK2xqmh4sIxIGR/BHpLOfBYHD54v5or7fvf4lYJbswklUc5xwaqahW/MdSdYmU5NywFlT+kQu91M1iagVIMQYY/xKRPKDO/30Z0OkkcbGJoX6KUh4YUqQBys5pKZP0ed/+B4GVMXGhNn6qsdIYvLLiWQLt3K2dc2Q6Chk2VLUxJov+RBJqzMcpemSMhvwiCGhSb6PtRNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BYAPR11MB2789.namprd11.prod.outlook.com (2603:10b6:a02:cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Fri, 24 Jun 2022 02:45:16 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:45:16 +0000 Date: Thu, 23 Jun 2022 19:45:14 -0700 From: Dan Williams To: CC: , , , , Subject: [PATCH 02/46] cxl/port: Keep port->uport valid for the entire life of a port Message-ID: <165603871491.551046.6682199179541194356.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MWHPR19CA0064.namprd19.prod.outlook.com (2603:10b6:300:94::26) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aa050fff-26cb-4f7e-c552-08da558b91fe X-MS-TrafficTypeDiagnostic: BYAPR11MB2789:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ARnRUkP6uWzLqlqy9Mptm4E0fqzCfOy0GUrvnv7s+lplsIyjECc1aq9mXDfgU3RzwnAE87JH/+zv8ryKZ1UECasGQZgkCd/ifEyguXtghEouO0Lvxr9fTCDZTUywXov8b55XHffE9f+BZHjpdPC0sh+u/fFtCK3lSztZ9/MhhleZx96LbKbMvS4ANGJ8f3qXfOd4L5mymLpbFKKoIbkKjRHFqblN+cysmMIAo7bFpiL/wjcmyx75ua8tmFYssc9CUQHe58OE9hdJTpQDgj+MP9c3uIFtXFWZt93rgiio6MxdpQQ65AG0r51/0p328D2jUcWVtuE1tauNc1EaJKWzK+Cnu80rH0I8VP20/nftoqj8Qu23GjuOfF1cEeLK/eVFf9dTvLK37cmfWJMyTmA4oz49my3Sr2Ek5F1yqD2JTZc6g2DnpIGipR82aOfU3h6XS2pnbH4Vjd3vEy0AAMSRy+Plbo4tj6hR/IGV2fGQ+CoDQmJ0RYavcLwXfJhKkk8q8oEQWCMPGJBzLq9v4a5Pkl2VgjeNsr/X+gMREttPS3GJDE2rdqf0UMQ8JEt3EJV6JiqeKX321dAwKYkIg1IdAJ+ABIZYkKtTjtvFfkjpjw6Bu3GlPOOq4erekVaOKFEPEUY98kBZ8UFNQCqLO0dNhBIF5BtGouewaUOscwO0MavqDjZl8upaVC4B4EcIYbYVIFpTPJcKc8+Osu6Y9WSW6e9S3CWPBxBhpxo8a3BGKke+x+2xvtwl3Azl6lUgbRHD X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(376002)(396003)(39860400002)(346002)(136003)(366004)(186003)(41300700001)(316002)(83380400001)(8936002)(86362001)(103116003)(478600001)(26005)(5660300002)(2906002)(6486002)(6916009)(33716001)(66476007)(66556008)(9686003)(8676002)(6506007)(6512007)(66946007)(82960400001)(4326008)(38100700002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DeweV4nKjfdOECP7rVh+/7QY+po/h8kMx1C9UFfs8UpM7Qz2H0wEyZFZzh0WHfI5aOWc1AeAVWpeg4R1xb0cv0aNZ6o6C1pMNg6e5vwXQTiZmfm9R7v0/jdMhp2tdWAcGk1zDW0/sV7w2kIkm9dVYRG30rXHevSS/DZX67YApe1vujQ6S9UTVXfeUGgC6Unw6sZYsBL7NX/IMIevnILjrOKpA2gYRMPNexRMS+rgZGh5xX+CRgJLH35yr8DhUyUzJM1/39KbiPGHSXyfpfBbVBKqDPlIEY6IgrrRJ5NW/9BntKK6Et4iLigyQ8VgWVsmNYDDoj4O1wJBrhZHYGvLDx5L25683DvZls8m6Gzx0KEYO4hKekWABLXwSyVINjR3eSRbYei1tSXSj3p0GUs3g7FIubms5LMIrqKHXT7g6KmdMvSgwEZjuvmSi9Yi9XQTppQ2Fn1sRa+TVF9ZrHQD5E6iDg/SDYz70AANY7kfa1lVZUG00uQZ5plVbSFiewcf23QkGLc9SQ8nV8E3zZmNXILozdeqtf9aPohJfk8at2UeS7JkJksA1YWWekvyvw11znE68Izp+EsR+IwDIODkT0lpy4jZ75A9D0BZRFLihKU3GMrcIH4jppRn6iKYhdaIaflGvu/UEJDc1X6mLiVimJf8GQzX6wELATQ0FaqFw7A0eGa4KXwV1vWIuN+zM5hSNS/j9kzUcGxM3dX9JvO8Hw6/4/eCJIzbJ1Vnjo/iK4Gw0lHDICdlvKWReLcdVAUB6wdxqqU5yrCDAqGs8LBZAHY2ACgkc8POwG+dIs4ZxjP8/hhpGp8UPRU+X1sePi4MAaDYoCjPe5cTWc84uquDKYhBM0+KiXyhjRgRbKiITh9DQQsUcnMUdYiSOBSqJtnEWp924E21mETSM22W9awjiWHEDTCgPoljM49aXsKQQK0u3yuaGeEm0UGeHkXCp2YuMNv1XPPrOMIv+Rk/RfEUDQ+bhlKAqjCJYAaqb1OJzkwIEoV9JW6M7kx3WZszM3S9WqJt7qLIy3MVIhV0zUWVqMbdDUWBmilalSEElEdyfVQxr1zlmjAJFqiKqgFDFhlVCw01Mv4EP/T7uaP9Uq3CCq0hBv/4gsBMEtR9ceDGOgjyUI30uDDFMmysrPX30WM362iHzIvH0sBpyfWx5T+S88e4kODcaMJRazumc2x2ULzHaTwLEaKNC6jX5uIrQdO1xJ54PYYvffuhjMmAkhGe8hNhF4NRWFpQaWHjlZXHylIzFER5DhwCbHwjRlm2nWTbEi5f5FtAaPdF/xmHhDgTSyI7kURjKS5JEgIb701Xb2yum9IiliXteCm/kCMkJYgqp9PM0qMYWb9p6tTXx99LEcRcOQEBcYHd+yKE8hZU5/El6DpSQm+/MGwaO8YVSBepZ7hJqHCM3CGDQ+cqlCwKIr2nrxY/3sMYNWda+I7A696ei5PxDZQpV812otGpGcd+kFap4NeQWmj7HmxizM3+5YPfmtM/rklqY7M5YmDKy403NcGdaTcCiWeAuzLDm9k01OKWYEa7Xn9Lewl3WkYj0KAnRFOOmbZixHLIe1GoY0iZjevCTQhAcl8aLyQ96fkBylmeEjd4e3zXGGtj4aBIhQ== X-MS-Exchange-CrossTenant-Network-Message-Id: aa050fff-26cb-4f7e-c552-08da558b91fe X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:45:16.5960 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6aPjgwhcV+N8a0LydJwR4jry5y1VYrg/0G/1HyjpBZQyqP8QSBnAUExk+gwxkTOFElO66Ri/rEOC7psnmbas6pSClvXTnJrptmr/rqehvL0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2789 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The upcoming region provisioning implementation has a need to dereference port->uport during the port unregister flow. Specifically, endpoint decoders need to be able to lookup their corresponding memdev via port->uport. The existing ->dead flag was added for cases where the core was committed to tearing down the port, but needed to drop locks before calling device_unregister(). Reuse that flag to indicate to delete_endpoint() that it has no "release action" work to do as unregister_port() will handle it. Fixes: 8dd2bc0f8e02 ("cxl/mem: Add the cxl_mem driver") Signed-off-by: Dan Williams Reviewed-by: Alison Schofield --- drivers/cxl/core/port.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index dbce99bdffab..7810d1a8369b 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -370,7 +370,7 @@ static void unregister_port(void *_port) lock_dev = &parent->dev; device_lock_assert(lock_dev); - port->uport = NULL; + port->dead = true; device_unregister(&port->dev); } @@ -857,7 +857,7 @@ static void delete_endpoint(void *data) parent = &parent_port->dev; device_lock(parent); - if (parent->driver && endpoint->uport) { + if (parent->driver && !endpoint->dead) { devm_release_action(parent, cxl_unlink_uport, endpoint); devm_release_action(parent, unregister_port, endpoint); } From patchwork Fri Jun 24 02:45:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893319 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB913CCA47C for ; Fri, 24 Jun 2022 02:45:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230140AbiFXCp1 (ORCPT ); Thu, 23 Jun 2022 22:45:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229719AbiFXCp0 (ORCPT ); Thu, 23 Jun 2022 22:45:26 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3F5756756; Thu, 23 Jun 2022 19:45:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038725; x=1687574725; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=96xr+m7dAUviAItr5RCqd3u90WkJS6j6w751u44aiWU=; b=LNWk+b5ROftUlXoBtfhjqKlbmPn2+iYteqCH30CCGfkWu+dHbg+BHISw 5c/TfCJlJto8ibwpOZo6So2VDtfSpVb8i70RVBBR3H+UGA12uPxkyeEs6 UvGSr8lOFsMZh2nKwd3ESCwfERuYafkse5/RxamLMULkmvz9xVUwSxlHZ HwFa+sRgBb8E5/sXS7P7tfDYFnaaW8UrRb17F1OfdnWzYeFkaSbHhNQlR Pk88BnFXEnbiq23SkqRfzwObFt7Sg0R0TKrpsGGbuiWkziBpDy2fEnYAL Hm6kCwJYSPfcg2/quqRL3D3Eu7y1FxgDvO7wq4SCzdAmEGtvs8yuXjYgj A==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="306369892" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="306369892" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:45:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="678351411" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by FMSMGA003.fm.intel.com with ESMTP; 23 Jun 2022 19:45:25 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:45:25 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:45:25 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.48) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:45:24 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nWmS0Irzve6EXIYjUINl6FJbnU6U/KqcCJiKurGS9Y7hp42uKgOmWXniw+6PAADOa9rog0xhepBvmsHMhhqhYEleQOqeWyqEBtda9xZoKBYwyQY/WUa0BZ/5fwSgde9PZ6Ma3QEo3SSAjEuZoq+w24hp6FTX2ihuXQVx2RHI1Os0XohuqK8DY1l/oeZMxW55pkOlNm47SWOioIIrD1xVeW6vhRVQPQwXNlWd62Mu/J8pOglEb1TxnQMA2CpysOAVGaq8a8/9eRGkVTnHuakrX3QH3D+VyW0spgrzNi41nVWfQibjEcUfTQRLN+CC3NJrwb2NDnFhzK6IyXAOCuFKwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Fbc85OHAgyvJtOJL0+4pSfNh8P1vrj/IajGeq9zhwgc=; b=WcTxgTIl0Pk5c29vRxXEW/bBY0YghIdgOqGEh055/qXjThBeKP5i60uO4ocd6Ulyej+efPBvJdFnO0eLwQRoDZouvKPCSrIAKsbcfqg0wIEGUSZhwcJhVWhHLHNZS/SCY4WYXPKNTkn3HBjV+pqbbSl0S/bPHRSxA/7OlpFfm+EL8aZ+ZV2LFX3HyXUhS4o0E/UNkV25ccbFNF5z0+mrfqCxqCjSdk4LyO0/OruE8t2TejUIJ7qXMmmsWd+Yvt5Tb3iWEIv/0/aJ5YSsB52mEMgmtBkdMvLlR2tmRMYpWp93icb9LqDsPz/IFs8wiHF+6cIV+dw07F59AGxYn2VvkQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BYAPR11MB2789.namprd11.prod.outlook.com (2603:10b6:a02:cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Fri, 24 Jun 2022 02:45:23 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:45:23 +0000 Date: Thu, 23 Jun 2022 19:45:21 -0700 From: Dan Williams To: CC: Ben Widawsky , , , , , Subject: [PATCH 03/46] cxl/hdm: Use local hdm variable Message-ID: <165603872171.551046.913207574344536475.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MWHPR1701CA0001.namprd17.prod.outlook.com (2603:10b6:301:14::11) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: be838c50-a7ac-4e47-a1ce-08da558b9623 X-MS-TrafficTypeDiagnostic: BYAPR11MB2789:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4A0Z/AcFpVz/NjOIWph8gTWsC8PExg8rnQJ2kaav4g7tfGoaX2UZKE/VcxCGpOteu11JeJoXrW1ihJHadG/un51QsdiNH1hwME0hAibERLIo4Qgxx8+OH0GMD4ww99PO5C8YjHl+I2OSlZ7W4xaQTFfmzbsTxoyYeeWmNUvVQ9rSWxx1eFfz8LYQVvXOar4MsaIBCBkEdmrhdgIuwux3a95iNItShMnRA9t7nb+OSIAvuAE1sdtJylQSYNRSJTa1Go9EGTYNGEfF6BL4Xvk8Yyer+dlfO3apf+7dfQs07FEm3/7tl/0ONQA92IXEGfeU63MF0eh+xw3FPxO/69Mkz0kCSaeEhgAqilxK2uHEuuk00EbjwkkOmmOwfqwB2QWbtH0iq7fzFEwpdMW79oryZ7yWPqUEQS2I3Ew+Ngnj2IYk1wKjr/mGnle55vyzkP3Vop+GdJx86GWw/r2erO/y6GsoiFTc/Z1NRKRphv5OdEuy2lSUbf1w8Sa34M11nihLw3g3U1cYnyngqUtAqrkLxfdG5MjbaBHxduEEd0FUw2KoXOXjLvV5ww8VZtJ/U6UFCIeGGUCOA03eId1huV0DLvxq7hZp5Bz71hXWmWLskSOngcpOHJ6XZvcP1YpRD9e98N4/hA1wbEr6zw1BZUOKnQkPpJ2mxfljKhuQhSv/7lg+qeRTH2FIVSov+CvGC8dCF+J1Q+atHDOlFziNXhCUyLuArQObcTZah6vh3Dan52tvc7HJEpKa9fpIwLWVhtr2 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(376002)(396003)(39860400002)(346002)(136003)(366004)(186003)(4744005)(41300700001)(316002)(83380400001)(8936002)(86362001)(103116003)(478600001)(26005)(5660300002)(2906002)(6486002)(6916009)(33716001)(66476007)(66556008)(9686003)(8676002)(6506007)(6512007)(66946007)(82960400001)(4326008)(38100700002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: m9htpAoPFxM6UcaIa75lkA+m79zXIIpmw0pl/VJGU3m+FI7y8XoQ+EQWpSJKE9jtS8+bDD9ZemvMSsDNdugkOZkvbd3no9aBxWVsHhW04r6EV7I7/pvdIWWDVyArbnDXMZOE/7eQ4zu2nh6pkehoC0nG3eHUF0obW+C260RGkZi7+2LzGh9vYRQrG8epjpsQhrWo27thzgz81rQ+n+ogFYK2KQ2vXRzpYtk2NukaQm2d8s10y2uNURxeYGB9Mmka/lqjJlCWACjc3nUXnrvUBRwftrObLc5vuBW4B3sEheQvZ8JLtOmSo5M7q8AeQne85wlUka/QKD0Pq5ZRQrjz4J9VD7mL3b3/436kb+3cZvg9bbcxGlo2OfnT37DZb7vL/uXcoJTx+b/HJs5GJX8YcWzMskiGEb6TInZjdjvXPBJ45hK6+Z0Vskh+ruM6b9FWLEiiXrdgD0QNX87hfwoR9UdZeU/+7lB2nIX27/NYlJAaC0GcY+wWqWFHD6dUc/NO28skfcwuRGxICBH4sKWPCzXJz00mWElqZLp0WHHX5lZFmMAGPbRtfzzSss9WXy/9m9lcVooOgal8IiwvVZs+H5MbsQ/fkhlTSPGqi9GVRtpXBgsWHqwD7piXmyOxqCXDjaiypX0XN/4/6TtljVTWO47b+o08ecN8xH+fqypX8PPiL0p0q6A/JjL/nyTgGmb89n0aygL/vb5d1iphIGJNAhsiN9RsiUQ1zbkjIMcpc9b2N4brhe8LWTgTCJL9k6HVrtHQ7JiYtGQZf1Ltq+NvWlJ2DInWU/l9AkBqCTQk28vD9UFhj0b6h8/UMlXGXoT+ivH/tjoYGhV0hTnhMjg4dG7bt7+DqkkTrYTNaTYz/thJ+CCWbcll8HsO6+D4rJUUAdDKtKqDzZL8sCJ063tCCIVXevWI8EwrqDk6jbZfnWIcvAVf734qaCgBmV0Peo796R/En+a66qPzBTshaNUEcz+OjOdllT7IiE9sp2tAkY4d5GhvQlMxw3KwsAF+6e9tddE5AJYxWi3l+xN491ROZaaHDAQFMiLhmq3sPQqJQDX3yCyYV2BPlgAmU/Cqq4IctPcZnwXyjGHKAgaDFt31Vu9YfP4JAqUGvsr5CFrTG+36mQ0edOK1CRXf+wl+ET4S39zJwmWtDwdj/zUCVFyrYqUsZuwRqPwDzwoBFmleuK19Ca11Imge75ZR7LCUia7x/qDitIyEjLhcydf937G0/uvPEyxWBn4pbMC6akrqC7eKww2T6DW5ANcFSBAJRxQC3H70evJU2p2Im9KsYsnNdAEBQn5Q4zCMH7XNk5iBQLRqcNpHv/KyggetSb0aSLbiSGcFXsEGZ30p7oyrxWgUYt8SIN1fCrGgSsDzzdoNz0U4HlHBl0C60vIQgdWTu4QDvLPXNbrUFkc1eJrw+0l4Ko3k1ovz01t3Q2E2x6SDPA8pWmc7+g9igcZqdenwq9FiDNKGaSC6jHzu2H31+8AAXVxW0pV7P6XW6bzGOHmFxYAJDRZoNmgujlfidvc0tHSR/LxkZ7R1IB4ZRf2nAMEXiYztVHJrO2VbPf7guffSReVnu6vobfzh5JJPv3mv3iEdWFnIxWkcgTEJU444zdYg8g== X-MS-Exchange-CrossTenant-Network-Message-Id: be838c50-a7ac-4e47-a1ce-08da558b9623 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:45:23.5485 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jdwsoK4RGLETtTGLvl1xGa8AhUf7i9Wyd6DuQBZSM1hAJR5HwZ6Dm4U9XHJFQHf3LIT02QKynroU82FsvkN+6xdvP7hS2btM2OLWs/TSxg8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2789 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Ben Widawsky Save a few characters and use the already initialized local variable. Signed-off-by: Ben Widawsky Signed-off-by: Dan Williams Reviewed-by: Alison Schofield Reviewed-by: Jonathan Cameron --- drivers/cxl/core/hdm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index bfc8ee876278..ba3d2d959c71 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -251,8 +251,7 @@ int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) return PTR_ERR(cxld); } - rc = init_hdm_decoder(port, cxld, target_map, - cxlhdm->regs.hdm_decoder, i); + rc = init_hdm_decoder(port, cxld, target_map, hdm, i); if (rc) { put_device(&cxld->dev); failed++; From patchwork Fri Jun 24 02:45:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893320 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C852DC433EF for ; Fri, 24 Jun 2022 02:45:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229891AbiFXCpg (ORCPT ); Thu, 23 Jun 2022 22:45:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229719AbiFXCpf (ORCPT ); Thu, 23 Jun 2022 22:45:35 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4E7B56752; Thu, 23 Jun 2022 19:45:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038734; x=1687574734; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=3sxGh1GWh3epEzgXZGKHvSYQ6QP+W0Py2U7f73ecmLA=; b=NqvMqirTTLKijqs1sW0hnRShlZ9xHha76CaacaklJ5J12QecrbwA9ErW pcM1dw0MYXlIMBsbBDL/DSwWNw7mgKm2S7SchGYcYHh25u6IHi+k1Oq88 Snq4sAPFz78IerEPCu8wPfCKalv3cnLBVhClRFD9n/aHB3xJz+4DuiGCR oytFOnlQ3JOvGfj1A4jbDSPiADYQpfCcwxJA/rDOPBRohluNELTlHsMF0 w0kd1EaiSow/aJF7SUOuWdDr4cbQi/iszNA5+6uY5d9xFeqNLF+bBdOaM Vpq6hOwAIGZQKCXviNOsCrvOINkLf2mKVXBNB3Mot0Ztf9js383fNVCNY g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="281986006" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="281986006" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:45:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="834933275" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga006.fm.intel.com with ESMTP; 23 Jun 2022 19:45:33 -0700 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:45:33 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:45:33 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.46) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:45:32 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PL6rnUPTbQU0uY6uOEMrgfi4VyGbmTr4VRjghFniu4zQF52q20JB8GQieERlrcBncjSW45tfHc+VDTA2CNmSE07vCKBctre2aXj5NMnVN02PZLtA2ltYLZwLgDAXsmJoFpVKqwYmqUxYwF1UYgDkczH6TTLlttH1qjFmwNOSA5/DVQZeGXK1gguvrMBDXgcg0/ICwH7J/EBBNnPtTCCE9z6ZG33OcrI4DoupGToDPrqzClmtoftUvyK1jsCJ9/TuTkWE5lqTDE+ArjuPqt87kVSWdYaS7Dtk9CR7Ky8nk9MPTYbvptnlKgV88Lz8Rjb9sKEk45X5+Np9ACq219xRMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9JE4kNN+z/LRdwr0MhnPAFB0wvjb/XAjyw3+wYumk98=; b=KRPQZnwXG8uiOPVNSIsXZNoF5YvRR8bcA+AWCbL806BzVQ/CeZ5rh8+2rsKun6atCaEVSTmYp1WOrCSagqMIFU6Ive94R1lxOw4MaZYhLtAPiLPV8hvJEkJYu4X/BQmocoCSoOAMrwCgvb5EI1+30dojwPtAgK5Tn28sJFKcWXp9w3lgim+uu+2dQO7jSisBXeuhaBqBVY/onoLNtWg5AEC3ZeD/XtvfY0rPLc+g+H0YRCae7mp10qE6k52zcopKViUdG4YwdfPoPSA7FqdKJzwI/dU6P7/0CRrU8p6EvOp80r2Iyx2kUVduQxQ97GK9MizrkVVGUtBWlMppcN7xcg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BYAPR11MB2789.namprd11.prod.outlook.com (2603:10b6:a02:cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Fri, 24 Jun 2022 02:45:31 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:45:31 +0000 Date: Thu, 23 Jun 2022 19:45:28 -0700 From: Dan Williams To: CC: , , , , Subject: [PATCH 04/46] cxl/core: Rename ->decoder_range ->hpa_range Message-ID: <165603872867.551046.2170426227407458814.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MW4PR03CA0151.namprd03.prod.outlook.com (2603:10b6:303:8d::6) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 09b049cb-7dc3-4010-50da-08da558b9a9e X-MS-TrafficTypeDiagnostic: BYAPR11MB2789:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AkeCNcKkEimcMh1qm3ZvFRfqRRKhTS0uEjzY9DZdsEf7PqjMkK6IEut8LLlPYR447ONptWksHa3WUG7iSJ6ehCc2MTdRivMrdO+UCXMIIqFFzLt6WdKODsCSskED6vFeMsAkrs/ruht3t6O9lD84NzjmRDwIl6m8jwfzYj/b8KgQGWDqNSs3kLwC5p4mqsgOxGnvSPsGacD4MT1c4jPlmtSq9i9lck8MVj6Bxdgi1Wkskn11zRr5/Oe9P3RMil/ta7pWxXF3CETaQ5eCYJcKyPuAhma7OJ3SAP2vnM3urNcR6B29GEgR/riXNHJlRMGqeWUulV4iDXitGl4I88mj6ftQQ4ko7zbUKd6EFh9h9ePlqnHs5YjSxy75JRMgxNP+/ZhR6DfC82RxMdbn7M5b1qTsHKIyxRI8/1PNbmXulRjcrX8UVUIVCpqLLYz/xRoKBhadiRyGx1URwzBLTTtTUXX6qQDP4LT5hJTTVD4dljdUmBVQqtptqic301fcai3DqyRU1rqw1y/fi3wR2TNT0hJ/Wsk0CprmZQRt4akV/gooAsFs4kxa6eyw0iOyucynnQZUnXpwVT7wrsLosf3ZfZ5fJAN3KGehQ4himnL2wujWbJsvZEjyDE6uPMMVVj8dcKt+T0mLz2Rkhva/MgFCuOGg63wCJhXbRnkW/BQ/hN3LhnawQMH0uvkuTvdtPq7m17xtvQLFxf6QXwZ5wY2SI3eRx44TihMQmxzqmXkK5TE7BkJwfNYXT8yckLqJt+CH X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(376002)(396003)(39860400002)(346002)(136003)(366004)(186003)(41300700001)(316002)(83380400001)(8936002)(86362001)(103116003)(478600001)(26005)(5660300002)(2906002)(6486002)(6916009)(33716001)(6666004)(66476007)(66556008)(9686003)(8676002)(6506007)(6512007)(66946007)(82960400001)(4326008)(38100700002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7dk2BAml8ZIBvI3TqrKfclMkdExDSEfT+ZCh7RZB9PkeIzq5lUbK20mE3JIkMTNQ2UUym5nOwSuWd81X7C0RN99+v9ZK8aiLYD30DZHywHCm0rHPq5oqJk/2V1JcgzCxmCu++Iy1BHG5rIcvVSpPP6Giwy9dmwX10UulZPHXtgZCaaxgqcgKmwwgUyA9fkkgqYQ5qbVdkNxvdtGhYa59i+3K72FxcvA3uBuEBICZDAo+xYbApw8GfzgxhgQNqrH0Gw4IiygkX0l59zAHttsjnw24q7DrGxOOLpaIJwFGLoL7yX62MnKy79W7JcgszDAqGvYUwGx6fTk+JYwmAkrQBPTx3sB1s3DvDZe5Nl2sdvsYk/wAw1tEyKnWZejC92Z3K+eDMdyad9/XbfLhDx39x4JPeClrJpTOxoWniVatiMRDJ1ffuFYt/SFQ7hlFjNKDebUn6nPXP7ID9uqXvTu0ascNYYOoxxExVt0BH4PQKzRnHamjBpSZrqIFHrHuei9QVdmRXzbnutCPxQksPcJRBUwMUMOI2coaK2MUfHmyz1BMZwKC2aCNCdCzoLs2noepfRkhOlX8BYHTGIdVCxRAFaShqtgR8ZYcM6Vs8pM+VqcCgbexHA2s/MwDOnq8WN3e5V/n+giletOmwNPV+QAb+/ehSS0flKuSMqyqS8cJzdMJ6tGbswP02ZJiEIqiqImJ4lxhEh9MTDvRwdXjNlsRbfViDtYIcT4WyMCv6QHyn4iHBIkJQNUit5axAXf/RbuBTu7Pr7DlV1jkiif/gNhGiNKI3JhRLxT4LLt6iXeyc0jLw7jIBm6RQz4j250RHzHuZcEbttGUF66gQSxEWqrHEiBuS2DNXAuj7CcqiKykGbU/eEysYjG/MY/HOWkIPAvSuEmTcRTupssFYsdU4CpbiIH7TXmXvjWM7W/8CPYc1iaarCXQBCrEA9SOhewsAawSY3z1gwTOjRx4mY5QGQ8rrwvFY3jYs4DLh/nZIUhEXqY1ZLEtf4OzIjRaszZijjfkI9mMdidwAwmNaPCGIu78x3nR325xMXAjdWCgeq1Amh8EwNKvYjVFK7vN8AuZ/xlHF42mCgCpam92xHDXXN5T8K06FVF7jzDksH4yh/XfG6lsG205VpfHPu75vxpZjV537zmk7PHAuDjf2/BRrXPwHOVD76pSw6G+LBzSidApqr+zymaB1SdjF5HMjx7pLr6H9lbfjWA3BQo5LNL0pDMM30P7qv3CdvHMfobwETJyR2rW6gkX3cmvRqyEQbkyQ6mcR4OgVjeHrd7EzB6fXxYPa06EQBcidM6b8zZPNqRFd6z3R6mGTgN4WBr1jzedWv8wcOpQJRRDTHdG85MSCiNnvX9No7oY2/1LTOaI3H60ahkLSigSzqevgLcO5RUjsTMLKKpvyiv43x+6g4DobpLSsVtACSD5KydO0S3VOXzy5gFpwN01l9TQ1hBKJFsrx8OrHzXb6OhADnS8yRAHkrOmzGNr8Ydati/nP91XpVn+clch6FrKCfvyNLe8uOFJVbKiqK1mzt3ceD2kkzjUa0YIHOBldBq2kkK/5jH19IQvKs/RBSLAzJLqpRhOuYNGC5i7XpWs+k0GwS0FdfyOznFkUQ== X-MS-Exchange-CrossTenant-Network-Message-Id: 09b049cb-7dc3-4010-50da-08da558b9a9e X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:45:31.0478 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: c/jN3SvAN2gj4Ja5dcW7T4YLhwgTACAdLQquyWI4hiGTVorwOolK69BJTMiWxr7MJ0xVoPol+1HHoc8nTyIj/Ns9N+r40BOyWZBlLB69pZ8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2789 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org In preparation for growing a ->dpa_range attribute for endpoint decoders, rename the current ->decoder_range to the more descriptive ->hpa_range. Signed-off-by: Dan Williams Reviewed-by: Alison Schofield Reviewed-by: Jonathan Cameron --- drivers/cxl/core/hdm.c | 2 +- drivers/cxl/core/port.c | 4 ++-- drivers/cxl/cxl.h | 4 ++-- tools/testing/cxl/test/cxl.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index ba3d2d959c71..5c070c93b07f 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -172,7 +172,7 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, return -ENXIO; } - cxld->decoder_range = (struct range) { + cxld->hpa_range = (struct range) { .start = base, .end = base + size - 1, }; diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 7810d1a8369b..98bcbbd59a75 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -78,7 +78,7 @@ static ssize_t start_show(struct device *dev, struct device_attribute *attr, if (is_root_decoder(dev)) start = cxld->platform_res.start; else - start = cxld->decoder_range.start; + start = cxld->hpa_range.start; return sysfs_emit(buf, "%#llx\n", start); } @@ -93,7 +93,7 @@ static ssize_t size_show(struct device *dev, struct device_attribute *attr, if (is_root_decoder(dev)) size = resource_size(&cxld->platform_res); else - size = range_len(&cxld->decoder_range); + size = range_len(&cxld->hpa_range); return sysfs_emit(buf, "%#llx\n", size); } diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 6799b27c7db2..8256728cea8d 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -198,7 +198,7 @@ enum cxl_decoder_type { * @dev: this decoder's device * @id: kernel device name id * @platform_res: address space resources considered by root decoder - * @decoder_range: address space resources considered by midlevel decoder + * @hpa_range: Host physical address range mapped by this decoder * @interleave_ways: number of cxl_dports in this decode * @interleave_granularity: data stride per dport * @target_type: accelerator vs expander (type2 vs type3) selector @@ -212,7 +212,7 @@ struct cxl_decoder { int id; union { struct resource platform_res; - struct range decoder_range; + struct range hpa_range; }; int interleave_ways; int interleave_granularity; diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c index 431f2bddf6c8..7a08b025f2de 100644 --- a/tools/testing/cxl/test/cxl.c +++ b/tools/testing/cxl/test/cxl.c @@ -461,7 +461,7 @@ static int mock_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) return PTR_ERR(cxld); } - cxld->decoder_range = (struct range) { + cxld->hpa_range = (struct range) { .start = 0, .end = -1, }; From patchwork Fri Jun 24 02:45:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893323 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18DDCCCA47C for ; Fri, 24 Jun 2022 02:46:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230196AbiFXCqA (ORCPT ); Thu, 23 Jun 2022 22:46:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230151AbiFXCp6 (ORCPT ); Thu, 23 Jun 2022 22:45:58 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B69956C14; Thu, 23 Jun 2022 19:45:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038757; x=1687574757; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=lztxfZRTkw+tYTGW2KFzc8KV1gc8+a1gWX+htcS2Qiw=; b=CnnpkyOD5NKKetaLLFXKLt0NvTHAL1K9Pdya4Gij/nvHsvln/kFoHqQx iEX+zMmdoF9kOUwELHHTscinL04j9YHuCJ+8qvn8hmMfTrNtfIFAB13Zq C0dhIn++vzK5WvMuA52dmjKen/14I9aJQOrIvC2mN5rFuvHAzKj2Yv0+J kDA8SzFyIrC98dgYaYm1aUyrK9vc+q8eA5nE/VBUvM0QNU8FXTPo/KO2y OzQenKbwf3qagBiiW/F6E9/Xsp9cMqEXXaVeFGtyAONBa4MlOpii/UzRY Tn+ozrj3umUVEizUyQmQsMCcUMxI6fGIXKg3LeLfWB59wysgg1tdnmWG2 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="278453277" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="278453277" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:45:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="834933361" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga006.fm.intel.com with ESMTP; 23 Jun 2022 19:45:42 -0700 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:45:40 -0700 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by fmsmsx607.amr.corp.intel.com (10.18.126.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:45:40 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx607.amr.corp.intel.com (10.18.126.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:45:40 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.44) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:45:40 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mfY4AkuOpHPSFp54Yip3gvGpt5xlV4Dl847O9k1JAYjkUrYJ24+RrVPNNegFW1VdkiVZPUNoxYUROLTikqiqBo16b8YVYzdN/ZOdeDkJalTzCfrup23hYB/u9j2sZ2FinuByP4Gx2p6fcsT0pPaMkg9blfbXTz3BJWVcPBTPnIMZVzQYjZtbFgifJc0feo3W+e350wwxY+86/0TLSzFWLP6+cm3WvdpDL8GaeeR34q21kBCNspIm7RgtfPpthyCb6cCjilf4fjomRhVfDpcBEWdcFEvnyAFjoOOrc/qTG1yMhEAD+Ayzf7hwLaJh4DY+LldkdPvcoePmrC1Pe07t+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cv2ThpJpK6my0vRxdEoVQSo2pTugOm4681/Sov4BhA0=; b=C0JtzEPf1NUDI/4ufMlvdYaxijIHTYhUAB6rZ4Dwurlnzq/L8vog/aGiuhyHGZZAv0ulmG02ZgISktzku1mJ/uk6RAKuL98s9Wqk804lFb+DsyG87s7Y3yVnx2hDmHOUb/Ow6PHBIeeCL01NhJLVTYdsS2T4JlUiZ3RQpICE+Wcioy51fNXBzwzo7X36witlHOcUOhb9OPPWAa36kYFff4dRuXgLsl/uw2Z2rbvmdF8UqPUoakCNXe7o5x9tDJ5HMoXlTSDKPNnJ6PHf0Zs/8ZVaiRY4K14Ogu358UrJshZ9mjJL4mLZggtRG7pFxWtRZZq6Jg23ZVkx5RF8rdLJ4A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BYAPR11MB2789.namprd11.prod.outlook.com (2603:10b6:a02:cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Fri, 24 Jun 2022 02:45:38 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:45:38 +0000 Date: Thu, 23 Jun 2022 19:45:36 -0700 From: Dan Williams To: CC: , , , , Subject: [PATCH 05/46] cxl/core: Drop ->platform_res attribute for root decoders Message-ID: <165603873619.551046.791596854070136223.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MWHPR13CA0039.namprd13.prod.outlook.com (2603:10b6:300:95::25) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f70cf0dd-f95f-4af2-b455-08da558b9eeb X-MS-TrafficTypeDiagnostic: BYAPR11MB2789:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tItsLBLc+betbxo5O4s7pEJa0Pau7COFu2+nE5YiTV1S/nUIaK7gMDn4Qdrq+l3ubxUjmwDLyD69cQzTv33GRn9klY2ZC83fHa8tBhf60hWOXQltScz6dNZf6dTaoLETL+iz91gCO5RDZPe0RWCb29aZjq/LNcMY3TaVJvmSwiqojllpMseEmtM5CiXf5HaYR3fzDsZbyUfprDZ2TlI3oysyfhWMd3vFjknoTnRwsL2C0/WV9i7j0Rr+lRJEsyseyb4FwTDIHX2+wn9btlneTuLR8m69PJWXMiQiff+ygCK4b2vbpM4msLsIQZgeHWrxUwTTB6WHSTJrnGxIWc9IpeXTpEnOu6itk5X9w4OluGLmxolNUMEi/t9uxXCxhpnfZD2nx2dSi5sHrA3w6yZrqUSTpXKBOGOyec7fWhXI3WRpzVvAzPIDiAwQCYChvlJKc0HsSWy6jEDusyTvjr10wTWRvZABhOJe8MEZYwfw7qmjEpB+yX8ecAalccYAbyusqyjML+lTLB93Acu7dunidnvf12LXgvHJ6bwPMQtWcLePmhCzrNiKyFc5mUnUpbbJBt6dQ5vI79dr9GJ3IUUKeBWq+nKicODmPhEsGzXF9bEcRpmmNeB2qWqVQWisB427bjEvgnZ+Ev/GSvXybbVKClE1tEkqeMwUH5gnbVHH+AV+FH4Hy4X3E7HuAmOMlMQOjRKdhIKV+FZgJl0qttFrmuZaGbIzP10C84ezP8kbgtWbhQfm2vwemJZmNDqhh5e9 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(366004)(136003)(39860400002)(396003)(376002)(346002)(8676002)(6506007)(66476007)(66556008)(9686003)(82960400001)(33716001)(4326008)(38100700002)(6512007)(66946007)(41300700001)(478600001)(316002)(83380400001)(8936002)(86362001)(103116003)(186003)(2906002)(6916009)(6486002)(26005)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: b9Qd/yzko9gooImQS9x0PySU6HBUYCHs8yxkXiU419ztsAaWreYoMOBeJVSHQvTxIt1oFFNriD0C4rTG8KIQd4SIy8gpG4kx3BUCCh+GanB8JlpZkfkbX9ldRQthwq5p8sCPFBtGVrDNou2sxiE1hHcumLPcKEjrDW8ZGGskMFscYyHdAwNGCnqOKzcs+X4y1hftOrsP5lPNrOl7C9q4SYWRwQXaH8uYEp5sLk8NMwS7f+4fQj2SWvhXU451iJV7xQoXcmb3akTJMRo7YgvlVUQ2+Z2PTYdElFRKABaUfsyV7SIh/nnP1tmkXKK4/+1MDLNfHhFntZbK+WlDVcMlQhQUITqmfxK4wjnXHPqOldTGE4L1+vrYbxleL1ZXvf5p8xj2m1gR41OdmZbj7dcUapa0sppo+gP1dw4PUNjIRrhUasbrsP0dASNVCtAjCK0RNnvxCih/1KqRXkL6ivGRoC3+Rs/iSPzcqDJeYCYufhu5X9CGg859LfasBjE7ubc4e1AStkwUB282kL41n06Owl9L2FN0xsKjEIej8aIn2Kt/aYgTPj06I4zP6O7RpCWZIrX+udKfJuz3gavWyz7pIe6wqLicdjuveFMkk3ccD6+ksdo0XugwI0xjVhK2KFM9I+uyN+zA/BqL44U6lW+0InheKAM0pV2+JDIktJkm4W0Na4Yyr0GSua0Sp5DcxPUthhj/OxUaVYeZ7nEP9V9XXALssVhmznJAMpkCqLYgEIFq8wLhHDmC8ZPdnEwJFjxFWCy/wCG3pfq34FpU9L1GK3GlK+3zqryLHlMfo2YwJycgxB0diMsl1k3QiTayDKDzc4rsOjjK2CQ+RBbS4+WKxOaRaJmYBNFS+Ql0ajpIwTdVc4ltR8GWmSyyvgUlQ+3SwYR1jRRvDl7LEkBfrf7SXxaqXckjliL5NqTlOWTLK99WtmPE9jNadONnRi7HIHRjVILWYT1p/5YZp2XQzoYLW/gHQFOl0LdcI0bBuMRgr/a3CPyHbev5rGo55iy3mEyUfan8umFuTBb8dzmdaQDQWiR4avncfFU8wcRGL88lqjY1bQZt7j42oVLynPpswOJm7XFxAJ1FFUwH0bcuWXBZXnxzOOXHDamE5QwK5FV1TU7ht5QbiZeTpyqb7sm1MURef5U0rnjxAWFnOe5OPfTYsFL3bus0CdaPab/zxFRymc4SSIEJiLv0EVq+aIS/E5PZOhpVKh1t+O3XB0VdnRPESfEO79NUFnRO7Sm/0UO+KAeFyU2z7I6BZ0CWhQQJII+znOF8t0pKQ8UX+G1SMSR9jL1RYK4rQaAmlyOE9O+3i3MRrkQRqeexm23xWpr672rvWnXfWUPMxwp5/OBdTIj7F1B6iVD7bI1vBMaPky66p+9T4vo49kIeNvwhbNwAYaQib3k2w285U5ZWI0qNltg8AChJhRxc6yHep23FsxKlRkXw/74utaAFcM3LURdcrBpnYDjhY3tDhyMPnJRNXdEwUH3Nmeg3GjGrBuf6PXu0f2r2RvOyQK5wavJr0XlGJdzqJW2EVWq+g+dwp1B1YpifWGekDikpseRwEzG0GvhtvKS3ShTPbcs76r8XwTlKv5c/DzhuBHHE908lG2r/SMuLoA== X-MS-Exchange-CrossTenant-Network-Message-Id: f70cf0dd-f95f-4af2-b455-08da558b9eeb X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:45:38.2971 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 0PMz2y08d0h2X66wYTC26RauMrwdQyWj0Htfga01jeV14HYyFPtPJkdkpuNdDvM1NrYVYH8znBVIUTGavr0ckJ1Di7Nd3G9CggnHA02jkYs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2789 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Root decoders are responsible for hosting the available host address space for endpoints and regions to claim. The tracking of that available capacity can be done in iomem_resource directly. As a result, root decoders no longer need to host their own resource tree. The current ->platform_res attribute was added prematurely. Otherwise, ->hpa_range fills the role of conveying the current decode range of the decoder. Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- drivers/cxl/acpi.c | 17 ++++++++++------- drivers/cxl/core/pci.c | 8 +------- drivers/cxl/core/port.c | 30 +++++++----------------------- drivers/cxl/cxl.h | 6 +----- 4 files changed, 19 insertions(+), 42 deletions(-) diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c index 40286f5df812..951695cdb455 100644 --- a/drivers/cxl/acpi.c +++ b/drivers/cxl/acpi.c @@ -108,8 +108,10 @@ static int cxl_parse_cfmws(union acpi_subtable_headers *header, void *arg, cxld->flags = cfmws_to_decoder_flags(cfmws->restrictions); cxld->target_type = CXL_DECODER_EXPANDER; - cxld->platform_res = (struct resource)DEFINE_RES_MEM(cfmws->base_hpa, - cfmws->window_size); + cxld->hpa_range = (struct range) { + .start = cfmws->base_hpa, + .end = cfmws->base_hpa + cfmws->window_size - 1, + }; cxld->interleave_ways = CFMWS_INTERLEAVE_WAYS(cfmws); cxld->interleave_granularity = CFMWS_INTERLEAVE_GRANULARITY(cfmws); @@ -119,13 +121,14 @@ static int cxl_parse_cfmws(union acpi_subtable_headers *header, void *arg, else rc = cxl_decoder_autoremove(dev, cxld); if (rc) { - dev_err(dev, "Failed to add decoder for %pr\n", - &cxld->platform_res); + dev_err(dev, "Failed to add decoder for [%#llx - %#llx]\n", + cxld->hpa_range.start, cxld->hpa_range.end); return 0; } - dev_dbg(dev, "add: %s node: %d range %pr\n", dev_name(&cxld->dev), - phys_to_target_node(cxld->platform_res.start), - &cxld->platform_res); + dev_dbg(dev, "add: %s node: %d range [%#llx - %#llx]\n", + dev_name(&cxld->dev), + phys_to_target_node(cxld->hpa_range.start), + cxld->hpa_range.start, cxld->hpa_range.end); return 0; } diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c index c4c99ff7b55e..7672789c3225 100644 --- a/drivers/cxl/core/pci.c +++ b/drivers/cxl/core/pci.c @@ -225,7 +225,6 @@ static int dvsec_range_allowed(struct device *dev, void *arg) { struct range *dev_range = arg; struct cxl_decoder *cxld; - struct range root_range; if (!is_root_decoder(dev)) return 0; @@ -237,12 +236,7 @@ static int dvsec_range_allowed(struct device *dev, void *arg) if (!(cxld->flags & CXL_DECODER_F_RAM)) return 0; - root_range = (struct range) { - .start = cxld->platform_res.start, - .end = cxld->platform_res.end, - }; - - return range_contains(&root_range, dev_range); + return range_contains(&cxld->hpa_range, dev_range); } static void disable_hdm(void *_cxlhdm) diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 98bcbbd59a75..b51eb41aa839 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -73,29 +73,17 @@ static ssize_t start_show(struct device *dev, struct device_attribute *attr, char *buf) { struct cxl_decoder *cxld = to_cxl_decoder(dev); - u64 start; - if (is_root_decoder(dev)) - start = cxld->platform_res.start; - else - start = cxld->hpa_range.start; - - return sysfs_emit(buf, "%#llx\n", start); + return sysfs_emit(buf, "%#llx\n", cxld->hpa_range.start); } static DEVICE_ATTR_ADMIN_RO(start); static ssize_t size_show(struct device *dev, struct device_attribute *attr, - char *buf) + char *buf) { struct cxl_decoder *cxld = to_cxl_decoder(dev); - u64 size; - - if (is_root_decoder(dev)) - size = resource_size(&cxld->platform_res); - else - size = range_len(&cxld->hpa_range); - return sysfs_emit(buf, "%#llx\n", size); + return sysfs_emit(buf, "%#llx\n", range_len(&cxld->hpa_range)); } static DEVICE_ATTR_RO(size); @@ -1233,7 +1221,10 @@ static struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, cxld->interleave_ways = 1; cxld->interleave_granularity = PAGE_SIZE; cxld->target_type = CXL_DECODER_EXPANDER; - cxld->platform_res = (struct resource)DEFINE_RES_MEM(0, 0); + cxld->hpa_range = (struct range) { + .start = 0, + .end = -1, + }; return cxld; err: @@ -1347,13 +1338,6 @@ int cxl_decoder_add_locked(struct cxl_decoder *cxld, int *target_map) if (rc) return rc; - /* - * Platform decoder resources should show up with a reasonable name. All - * other resources are just sub ranges within the main decoder resource. - */ - if (is_root_decoder(dev)) - cxld->platform_res.name = dev_name(dev); - return device_add(dev); } EXPORT_SYMBOL_NS_GPL(cxl_decoder_add_locked, CXL); diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 8256728cea8d..35ce17872fc1 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -197,7 +197,6 @@ enum cxl_decoder_type { * struct cxl_decoder - CXL address range decode configuration * @dev: this decoder's device * @id: kernel device name id - * @platform_res: address space resources considered by root decoder * @hpa_range: Host physical address range mapped by this decoder * @interleave_ways: number of cxl_dports in this decode * @interleave_granularity: data stride per dport @@ -210,10 +209,7 @@ enum cxl_decoder_type { struct cxl_decoder { struct device dev; int id; - union { - struct resource platform_res; - struct range hpa_range; - }; + struct range hpa_range; int interleave_ways; int interleave_granularity; enum cxl_decoder_type target_type; From patchwork Fri Jun 24 02:45:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893321 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3742CCA47C for ; Fri, 24 Jun 2022 02:45:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229719AbiFXCpu (ORCPT ); Thu, 23 Jun 2022 22:45:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229549AbiFXCpt (ORCPT ); Thu, 23 Jun 2022 22:45:49 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 503B156759; Thu, 23 Jun 2022 19:45:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038748; x=1687574748; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=vshyiKNIRiivM0/GNnEbZ6TFPukiX5fyudCX+h0lFd8=; b=SZbz1nbr+tJnVW/XOhrsinxD2MzmT+XAk4nRWYOuZ/W/aCZUyJlCVspS 9RVFhygaN0A5uR2XdzNtOrhgmav0r8dVuxhMWXA5gX/3LtbmtseAltc/u axwzR+MkMFpAp0UN3sn+hMzOyv+S9Ora/iQtOcLSe/YstScQDo5ZbwUbf MXzNYPKqxa57LgrUWQCURkENHwOn1ZOvNUuwIpzW6BJ4k4IoKJUMz9xj0 COM4ABoeVh12rhA4TpU8MJ9UKzji18wELcNvvPXc/f33Y90JaDGYaDIam cpL8l8Uy+sL0LORLEuqMRjAeXlyJEKA5tdN0Wl2CK8rT/owMPwgJK9bAj g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="263941317" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="263941317" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:45:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="678351582" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by FMSMGA003.fm.intel.com with ESMTP; 23 Jun 2022 19:45:47 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:45:47 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:45:46 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:45:46 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.49) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:45:46 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jZQhVp3YBCSRzS5CK29Qy9PvWNdwBvGQjebG3azMaTIMj5Y22KxRh0FtrrU0lH/1Ggzzl6EKmtX/F3nXZ/xSddLPEGqsavbfc5cfucL0gT78HNTcYAsQm3phZBcVALgxy0LjyJkMgU66vVJSGaUdqYkKS2ddsTqf7fT7TRzCvfjk0X9yvA0GyX3yuJk2Mqd1Gi1TEwKF4jLoYhk/vhDdwdRrdKOQPdnDh+GcWWkOnBHeCq2k8wlu4HHyB+rBNTaSxzENswUHIaAVRosQBqYHhyaqLL1DkQBlTxyA5YSN+FABsJrnvghM4Jy+I11VGvwbHwARVaGqtrMdyzgiTVn2DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JLxX+MtRX/Xq92dSdaH1c/b5Gkf5el2qnzTKsEWcGfk=; b=cKBmXG2ccYYKOCSggvfE371xDN814xKPU2kl9HotLXHpgx13IkSgDXZu31018RZAG2cfAdO6+a/GJFVM2b6rVymjcCB0ENyzhG3+ZpwKweiuLdLCGE4l4tW4bZRxSv9qsDxi0KulIZVMj+aUy4PrzOo8+ps1MMv3VWde61u99Sj6yXib5Iur+ykj7c/FTohjC8hZzUHCb29+ANYK8VUJcF6empGVzpLelVEedl9krYq5G86bK0oe6zlq9LeoCzWOZ0JCni9DDKFjTNFcQt1jCwajefiPgf8KdKIman+pJfJqwx/1ZJvP7nI0rlc8jwuGFjgUSKt+KG2I4LfiqvvzTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BYAPR11MB2789.namprd11.prod.outlook.com (2603:10b6:a02:cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Fri, 24 Jun 2022 02:45:45 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:45:45 +0000 Date: Thu, 23 Jun 2022 19:45:43 -0700 From: Dan Williams To: CC: , , , , Subject: [PATCH 06/46] cxl/core: Drop is_cxl_decoder() Message-ID: <165603874340.551046.15491766127759244728.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MW4PR03CA0153.namprd03.prod.outlook.com (2603:10b6:303:8d::8) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e8a59395-bdde-4bd6-f549-08da558ba2f3 X-MS-TrafficTypeDiagnostic: BYAPR11MB2789:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bM8RuYwKbr9iqIbSG6VRTndXruxcmJMZ+WFz+dTUcsn6M/gQ8TX/A1yVecMinkHdol2yrRiuRQYS6Ge6+86ug8M+LRdo/w0BmDYIZbW4tqPN9CUk1+9zV7lkezD5fcVp7bp5aQzfnoAV0F1A3ng2w23G/WR7D/KbGscB5YsNc1Zpeq3sOMeK5g4H4pwl7oaTKe3+ACyZEtbEAF6RCiJ1BiK5+u1BfnS6yuP5ZKtf5HzzZVgNcE2XNj6t+93BtKv+0Kq9qtp4xIJ2Jd/KSy4Eec5Y78MgWiH9C4FN9xp34Hj781gyNDzyYaIRsztvMHb73KbzKTMwWTHu+LjhLpQ9dVeheJ+5/xb6y1HsNTw7iRTQzwAhcXYXNL11J+a7JZB9XSr8aGkAqiK179HfuUDwfZ3udXdD4KvKSVF0DutXPRw0kxtsVyNXNwu+FyypqJQH9lSwJlkTbfZMsXbwaa1BX/aZmxw0lv4kqdUJWjv9WuehKjPlQJa0sl6vJNhy6N/7gxEmu929YnMYamt2SWaHVNY+8lWUiHfROoLBbda04Im4b6a9UOnw/e5ln5Rm7c2/Jl3N36nbzrr7eY2m3HgX5XBOZn9XXJGRfzZhal9ruU6vVGNA6fPkEj9jZFDeb22QU1TV8FuWUSFEgJ+/Iol9DwOLDCRSQ7bPCEBCTraYOi2uNRvYj0IirnY6lb5vAV8CLsGT0CExUdD/pYUwdV3oka2mWNMbnMwJDyk9Xs4PPLABgvdo4coz3lx06ISsJGuL X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(366004)(136003)(39860400002)(396003)(376002)(346002)(8676002)(6506007)(66476007)(66556008)(9686003)(82960400001)(33716001)(4326008)(38100700002)(6512007)(66946007)(41300700001)(478600001)(316002)(83380400001)(8936002)(86362001)(103116003)(186003)(2906002)(6916009)(6486002)(26005)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: C2SH4rNmF8ty3MpvhJ2TbbxxmNkRZM9zAY+9FZRZC1yen2jO/9TIKdXE5KHiBWXBVJTmoKTZIjzdXBxrgEdBYLTUi28MnexnRi989ylIkSGAQcucojtHS73VUOjwX9Wn1E7HKlbwrmnD5lQrXA5kgyDMTvYQbobCzh4auBMk4T56Hdlr/sBH6dJuzQwb+aqKjdG5mJwM1kMl1bJmYzsypGfbdYHPGwmooEuY3BI8A3f+H0VU6LNGGR5+QreRYHp6PwSpf+Ja9Ze6qDr9IGBC8FhdSZcyJUNobsJwcD5ZHO6x5mmN6c4rMTT/TvLHF4X5NoAW9SKrKWf5B6nETsQEGJV5x5MwZCkXDWYoH0pOKLl4A630Oh6VzqFtVmUFhZ9uxdzHNV8CavzlnPQOgOvMbHetafApxKDNe7ASpqDcAnQ3VatKWjoVK2RXFikIzxehYdDgt3AVlyiGlH83EcwiwY0slwv+O+8kaetsLujf6Z4rp/NOhBTMAZhjdIq1UcULqX0LqGZHwEc06glmPy4EaQxRoYgJ7/cZyvg9RAmRvPcZmTBNL+YB6mi/qsvyyDupUMDLbWeF4EJoivk/+cAqCskxbgDkyT/SZHX3upzsbtpsJYe0K38SWVNp2hs4iK90P16Q1M7tReJe6ncAVYjKT293TFHUuV2Ih9FR4DefHZFUJl+QjWC9ehP4ykjQueWako92H6cfpHu5bRmf63pkBh4VxE2hJFQpoMU8GwyXF7X8IQuQK15JHuNGZ/2Fv7pWYQDRarbV3zq0XznGa75lLP7Wg5f/Q8eXymSqgeKPll6RZXM3KOW17w09FWKCjbiYVzVH0IfkLEXoSbMYK+8r8AvxuG2npEPjuDTfrLBbSCn3fXytH+4Xz1IwGAKVTdizsgMnmWUy8spkr8yX18suFwa4+apACSR577HNDZisMyiBnbdApL6J8Yyb6gbOKSqi7g5pkqHJ00Ib79eHbwuBed9kCqr8pj6uYtNtrfU8HaxEFDlJM96I95vITum7kIkBcgmNvl27Vyrwtezmnzt1fWW2fYaQqrp6pAfKevPl/CA4OnTDZcjSxkUO6PVCoI3huRwsU6uabwlBvRCR6s5zmGGw9sFTFnQQNPu4UCsnEAsAMwoREk/lCTSzylWonNaYDd5Hb/1/JDuwzNvUKOyWXew+GngJiVfYFA6VguQkjhVK9DihFyM+xikKzl+EExAsZylClZzsZuRO5WE0TqOpkp6STqYaqP3l1BocicbGTumzFozHEmN1vwlRncPat3/XmN+TC/Zg0g7G2ESZ78tqRJyYGwKi+YfFBPhPfq7rt1m6IlZMLQu+2O7M243FdwWAWb6HxDy/mKuYL+0d/Cvi8Mc8j+m9z1yuU+UxR0FMy0QGJyBEACwGhSn8Cs/HLXIoWTyWZM8OKn258Fwewk7YmfOmLTxQ3r1VCseZb1GSEPzle+scDfiu5qfNzUDpLnaJ1Eieit8g8hDMby6jlx4yZIxvfMFmnfF5uhPTX6uDnRPY75U99ZChzzVyQkvASyNCXMnGF1HLFHPJTV+YlCx5AHtFpIJNksQ9rurqGmP6490Q6w7OvKC5QhZb15NwgVOkZgjaCR4IvRcwX2wwhLulMA== X-MS-Exchange-CrossTenant-Network-Message-Id: e8a59395-bdde-4bd6-f549-08da558ba2f3 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:45:45.0620 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: CUmM+jcYX+ESiRxcuQdIUZLVXk8bKwCwbvnBlU7OBi3GtF0fSpDRK+/JKPzaCxdtGBxoHZaCggIEFr5Tt5W8TG21bvn06341GNNkIjKYs5I= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2789 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This helper was only used to identify the object type for lockdep purposes. Now that lockdep support is done with explicit lock classes, this helper can be dropped. Signed-off-by: Dan Williams Reviewed-by: Alison Schofield Reviewed-by: Jonathan Cameron --- drivers/cxl/core/port.c | 6 ------ drivers/cxl/cxl.h | 1 - 2 files changed, 7 deletions(-) diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index b51eb41aa839..13c321afe076 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -271,12 +271,6 @@ bool is_root_decoder(struct device *dev) } EXPORT_SYMBOL_NS_GPL(is_root_decoder, CXL); -bool is_cxl_decoder(struct device *dev) -{ - return dev->type && dev->type->release == cxl_decoder_release; -} -EXPORT_SYMBOL_NS_GPL(is_cxl_decoder, CXL); - struct cxl_decoder *to_cxl_decoder(struct device *dev) { if (dev_WARN_ONCE(dev, dev->type->release != cxl_decoder_release, diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 35ce17872fc1..6e08fe8cc0fe 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -337,7 +337,6 @@ struct cxl_dport *cxl_find_dport_by_dev(struct cxl_port *port, struct cxl_decoder *to_cxl_decoder(struct device *dev); bool is_root_decoder(struct device *dev); bool is_endpoint_decoder(struct device *dev); -bool is_cxl_decoder(struct device *dev); struct cxl_decoder *cxl_root_decoder_alloc(struct cxl_port *port, unsigned int nr_targets); struct cxl_decoder *cxl_switch_decoder_alloc(struct cxl_port *port, From patchwork Fri Jun 24 02:45:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893322 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35874C43334 for ; Fri, 24 Jun 2022 02:46:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229941AbiFXCp7 (ORCPT ); Thu, 23 Jun 2022 22:45:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230185AbiFXCp6 (ORCPT ); Thu, 23 Jun 2022 22:45:58 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FBDF56C18; Thu, 23 Jun 2022 19:45:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038757; x=1687574757; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=EXnWE+J7Zp2SpNCBIEYR4p0bDMEhSMIZs+lhC3Q9JXU=; b=V4CpHslO3m9D3A7zMAMbmhM3nnb2JwcwOJNEVPoqV1BGVw2RwQ313C4o ZAO4W6vN1UZSXu4Tds0e3daICbEFo9qp1WVHzLXya/W6UwuoY76zxEKyU zwB8uootXzh94Dt/BnMzXbJZiMxfvelAL2ozhYt+rc7cYNNPg7c0xpGkq H93HbGNNf+598M5EI4Cpxls/jsyYoILNXQxGhKKf48mrVfnoyKXTcasRf 8SJJ+609HaeDyIDVUv9Wqo6jw87Zx6T1s2mJG5SaK/nHucNdloog3FBtO t3wTgTHFCsP9FFizlvSyTfAagoLlyl43YYN6nwdN+PCquzVNafZb65iE6 w==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="342591917" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="342591917" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:45:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="678351656" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by FMSMGA003.fm.intel.com with ESMTP; 23 Jun 2022 19:45:56 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX606.amr.corp.intel.com (10.22.229.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:45:56 -0700 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:45:55 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:45:55 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.46) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:45:55 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JqrSROwq8oBKU+KuDJidfxVDpjENctTd2B9hSmr7XGardAiZ7/CTeFzdDi1Yw5LuxXpCKDNitwInepPLChfkKjiQcUpOiBXTfaIrIbZSOkZn74mG80utLSp/+RYt63nnm105deUUEJ3RSwNjxrrFQmpqSyKbiq7uj3LDVa0xlbpM/6u/FgXn0H188zKP5fk37KuzD1qdweandk7i1yfBcdxJjWPS8gD+QZajrEawIuj1veYbYZEpD0H7PAXrda6OBGaysBOV7wVbYMGoew/qFyM1pgH8cuhFnGFFkXpMbWDA1oKTsBAR11ZkG38GLaEKw6/aG9lZLWQBJdIv/j06Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mPBQ5ilRJFGXxFOLqWib5IfP11kcFJ5soRm0M4uVu9k=; b=gQHppd2LR8BW15g64JdprdDcCwPy4EVwMIL/t+t48cEulU2VLdAmZQvbqSWnYePEgsG7h721VxOBrqaPWi72bOhxPEDnNNjuHQFDQCorgB6JdhAMV2f+3qv8Y0MZ/aoAtOAKJpi3icdRE6T5bqRouH8wUONNDpUR2xTPuUItPvb81vhjxjB/5yuEu/fVajxI+24bQ+xKN1e1ybiSv58r/CWukEeitHNaKjLZa0ri4J4tncBL1sYYaMVxCu9dgHJyGS1i4Vi+dlC92LSSmuIoZiga9wkN9q5Oz1wVcPWWj8NO7kXED9A1DV1HXOy17r90MJAXyb84Yr9L0A5FafjVNQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BYAPR11MB2789.namprd11.prod.outlook.com (2603:10b6:a02:cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Fri, 24 Jun 2022 02:45:53 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:45:53 +0000 Date: Thu, 23 Jun 2022 19:45:50 -0700 From: Dan Williams To: CC: Ben Widawsky , , , , , Subject: [PATCH 07/46] cxl: Introduce cxl_to_{ways,granularity} Message-ID: <165603875016.551046.17236943065932132355.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MWHPR19CA0078.namprd19.prod.outlook.com (2603:10b6:320:1f::16) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5f9d6f30-8cea-4d77-58c9-08da558ba741 X-MS-TrafficTypeDiagnostic: BYAPR11MB2789:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /FtrY4/C176V34LNqZ8qEa5iwClz0N5z4gAUgASbZ4LjsCd2H8PhLAxEDskBybhyx02nJVV3c93ab+5anV59oZnD7mjF7vsM509tEy9Ei8e8GLyTNqT32gYcQf9y4LBq19nSkGaDAQ1EZsXH9PUR37ibqdnCLRnP8NfhhsX7KYGid/SPC7WObC83jPVY+LupUVDffmVwkDDySMNzlPfzRUp765CA8Pav7Tj2IQ1VZ6LKu2jiJCRjNTJWNvDcP+SsCL7WLI7YVqi7us1ZwykGoApEw2MWTilTdW4I448ytmAcCkXbBHhzqDYR9yi2qOW9wq+sXK9GtqJxHnjKQTC2URaq/ZPC1n2Fg4TGK1j4wtTaemKeAYSZ9IozY+Ai+BmmoJ1tvM0jqhepfa5oJC2+2O8AVu4LlpfUEIwMG+vXaiUOXTFn3EDVjqLL9T6SVmz0Q/O3sqrlyHN5TALLllN5SpNmmDtTC19HT6nSYGu6TtL49+uuPtbial/l+BhslpMXdwRGZPx/YBitO3+Y0DVxku9Ynj/shMhkRnBfu32auxIohZC+nyopV4goZNU99xbNlsTiSYWyKPiUnykmZzbiiFpsnYCqdoOhQcGkAPYgNBXbMPAH5bXK470WMVw8GvKCIUq867YH+S/if/1UtBHJixk0K3nrLcdBAy1rRSlGfFrycQeT0zXsJA6BpJtVHF9SViPSIjmjOmA/xj1Aca6WoCRNNQ6Rmxbqy+/ENP59qoHlJ27TZvdTi7Cio/+KwK8X X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(366004)(136003)(39860400002)(396003)(376002)(346002)(8676002)(6506007)(66476007)(66556008)(9686003)(82960400001)(33716001)(4326008)(38100700002)(6512007)(66946007)(41300700001)(478600001)(316002)(83380400001)(8936002)(86362001)(103116003)(186003)(2906002)(6916009)(6486002)(26005)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QsHC+eNFC8puJXMkKV2oUlyjw7g2A+8sVDnfeqqfzNl+M4zWgmT64b5oXTdqrdJlguV9c/3lrteciVeiQHUl4Hl8upSoMtbnCLfRMgQDPbwWhwzQD8GprnoK+2/Q2wAoWXVyCvuw1+KBw9H+RtcU7g7w1xHiuBcKxFlt0slur1z9Ua+wZMlEXrGMkxGiRXQaAY6Cc3Kj+2It4IN4wtcUi2zI6pHGVIQh4S1lw16ewZhgSyg7UFagVBBR6L+4IyzS3mmzKEKP45invRswJ8ENMyloHhJXup8mcGRF0b/PUWXW59XRJfgKNG5Tn1iKpfEsYQL9cRm1T2GoDV/aYFK6NHHEGSLwwU8L5loA+5lnAoloMUilKHzRrdcP3ubJie5gxw0xEzFVWAK09oJKidBdadHwBEyUuNXNn0p/+Yi8t7/VrsOl0DIEb5t1ZiV8jekdHfFd4YSuRUpvJ1i9lGxvBw8vjzLME65392CCvyV2Ng1oOU7Ywe5D6vDL5LFY2+RaXcbxPRVDkhc9cWFx4LfypC5rnT8zC2RUbxCGWkMpk/1DPz9C60WZVPk6HxXdCoQsDCWlLhvpK7j3QImnGjeKa4CeQvlYX8Xk8++WbuwsXtCggEaLcRvwDRzx8I3WNRVxBiiFHtzYbRJ52pvuX3BEpGJgHBVqiiw7tu6hjCJ3TTgB2cTIU3NjKr87EyXiVRFtfcCc1o/zjrJ6TRcGWIqt284sbUPcrrql3mcbEjcPvzJ3zAHRlwKvcIb5bR/8y5ohR6zz6uOd4Q9FIz0UJqbVlOAsfnXqoMjpEkCS9oeEugyx5obpfulk6F8RFx7c80wFiYc3bW6HZxwuMJGCdB5lyL5nMHkESkcb1offi4GMJKgXgYrvHQpGUX/Z1TwbDtAPCx7apkDhbLZ6LKC6Yy/lA1gQeUvoouBNVKxgEiR8Iir6RQ5bYv2j4VwCwj/DcdGGC4pSufrF7W8RpdYdMx6HG/N5tQ9CqVwhiT/8KhoJY8iO3h9rDeUzl+bJhEhYK1HKti6kQ6x9FSjefHYv0LIhjXz40UuyuZALNUqOglK1fMAFdXnI1ovATv28r2GY7eh03J1hPZP+S7L6KQDXSHlseqstMm+Dtf+ZksYs+T4jXIlv6MgJOSXUtevDvx9zBZ+klarZW13MyhHxdC/niO2RmY0zRRUQElR4tUMrJ2FMxrfn9jSBMOcWOKdCt34qZBFWH5bSDIxF6T//TxYqcm7QdCUO4FWM5+rkGPG/W1gDbrjm/gCfxluOvqa7bxF9A1n6k5mqR+TdkTeiugdzcCtm6pH6a3a3RffOUkBwd7H4wYZ1is15QpgH/3udScVHJyr2e2ELKdVsOhvXf4BkGybRhecc5IavVcDmRUnQzIrjXcoR8JeGHBnZwY01M+28EEE10OgYH5mxCZRNWD1QBvQB6AzBP2ovnXgCb3nhrT1brh17alXfOgVDGZ53kSan3MTzZyQowcWQpGoIjMJ53rDps5DkmHg/71Dpp43kqOXpEYKIHMpnEbFGNVYvXpvgrJvXvgpZoRw0DDKUBD3H+nUoa4jfzy6vxzGnB42s2MYaT5A0tmJsn5YgCCuUf2d/Om+U50g3FW825F1YP6SNY3WkPA== X-MS-Exchange-CrossTenant-Network-Message-Id: 5f9d6f30-8cea-4d77-58c9-08da558ba741 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:45:52.2645 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VoGLnbdBzGNix9KRAyRLCWbFKkEg//5Z4iPYChZMB/7GKOkGHXLnB4DRjfFzqYGmFwLvHcgGEStL4IXavB73v+idU0Wf4DBjvSNwM+iObv8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2789 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Interleave granularity and ways have CXL specification defined encodings. Promote the conversion helpers to a common header, and use them to replace other open-coded instances. Force caller to consider the error case of the conversion as well. Co-developed-by: Ben Widawsky Signed-off-by: Ben Widawsky Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- drivers/cxl/acpi.c | 34 +++++++++++++++++++--------------- drivers/cxl/core/hdm.c | 35 +++++++++-------------------------- drivers/cxl/cxl.h | 26 ++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 41 deletions(-) diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c index 951695cdb455..544cb10ce33e 100644 --- a/drivers/cxl/acpi.c +++ b/drivers/cxl/acpi.c @@ -9,10 +9,6 @@ #include "cxlpci.h" #include "cxl.h" -/* Encode defined in CXL 2.0 8.2.5.12.7 HDM Decoder Control Register */ -#define CFMWS_INTERLEAVE_WAYS(x) (1 << (x)->interleave_ways) -#define CFMWS_INTERLEAVE_GRANULARITY(x) ((x)->granularity + 8) - static unsigned long cfmws_to_decoder_flags(int restrictions) { unsigned long flags = CXL_DECODER_F_ENABLE; @@ -34,7 +30,8 @@ static unsigned long cfmws_to_decoder_flags(int restrictions) static int cxl_acpi_cfmws_verify(struct device *dev, struct acpi_cedt_cfmws *cfmws) { - int expected_len; + unsigned int expected_len, ways; + int rc; if (cfmws->interleave_arithmetic != ACPI_CEDT_CFMWS_ARITHMETIC_MODULO) { dev_err(dev, "CFMWS Unsupported Interleave Arithmetic\n"); @@ -51,14 +48,14 @@ static int cxl_acpi_cfmws_verify(struct device *dev, return -EINVAL; } - if (CFMWS_INTERLEAVE_WAYS(cfmws) > CXL_DECODER_MAX_INTERLEAVE) { - dev_err(dev, "CFMWS Interleave Ways (%d) too large\n", - CFMWS_INTERLEAVE_WAYS(cfmws)); + rc = cxl_to_ways(cfmws->interleave_ways, &ways); + if (rc) { + dev_err(dev, "CFMWS Interleave Ways (%d) invalid\n", + cfmws->interleave_ways); return -EINVAL; } - expected_len = struct_size((cfmws), interleave_targets, - CFMWS_INTERLEAVE_WAYS(cfmws)); + expected_len = struct_size(cfmws, interleave_targets, ways); if (cfmws->header.length < expected_len) { dev_err(dev, "CFMWS length %d less than expected %d\n", @@ -87,7 +84,8 @@ static int cxl_parse_cfmws(union acpi_subtable_headers *header, void *arg, struct device *dev = ctx->dev; struct acpi_cedt_cfmws *cfmws; struct cxl_decoder *cxld; - int rc, i; + unsigned int ways, i, ig; + int rc; cfmws = (struct acpi_cedt_cfmws *) header; @@ -99,10 +97,16 @@ static int cxl_parse_cfmws(union acpi_subtable_headers *header, void *arg, return 0; } - for (i = 0; i < CFMWS_INTERLEAVE_WAYS(cfmws); i++) + rc = cxl_to_ways(cfmws->interleave_ways, &ways); + if (rc) + return rc; + rc = cxl_to_granularity(cfmws->granularity, &ig); + if (rc) + return rc; + for (i = 0; i < ways; i++) target_map[i] = cfmws->interleave_targets[i]; - cxld = cxl_root_decoder_alloc(root_port, CFMWS_INTERLEAVE_WAYS(cfmws)); + cxld = cxl_root_decoder_alloc(root_port, ways); if (IS_ERR(cxld)) return 0; @@ -112,8 +116,8 @@ static int cxl_parse_cfmws(union acpi_subtable_headers *header, void *arg, .start = cfmws->base_hpa, .end = cfmws->base_hpa + cfmws->window_size - 1, }; - cxld->interleave_ways = CFMWS_INTERLEAVE_WAYS(cfmws); - cxld->interleave_granularity = CFMWS_INTERLEAVE_GRANULARITY(cfmws); + cxld->interleave_ways = ways; + cxld->interleave_granularity = ig; rc = cxl_decoder_add(cxld, target_map); if (rc) diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index 5c070c93b07f..46635105a1f1 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -128,33 +128,12 @@ struct cxl_hdm *devm_cxl_setup_hdm(struct cxl_port *port) } EXPORT_SYMBOL_NS_GPL(devm_cxl_setup_hdm, CXL); -static int to_interleave_granularity(u32 ctrl) -{ - int val = FIELD_GET(CXL_HDM_DECODER0_CTRL_IG_MASK, ctrl); - - return 256 << val; -} - -static int to_interleave_ways(u32 ctrl) -{ - int val = FIELD_GET(CXL_HDM_DECODER0_CTRL_IW_MASK, ctrl); - - switch (val) { - case 0 ... 4: - return 1 << val; - case 8 ... 10: - return 3 << (val - 8); - default: - return 0; - } -} - static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, int *target_map, void __iomem *hdm, int which) { u64 size, base; + int i, rc; u32 ctrl; - int i; union { u64 value; unsigned char target_id[8]; @@ -183,14 +162,18 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, if (ctrl & CXL_HDM_DECODER0_CTRL_LOCK) cxld->flags |= CXL_DECODER_F_LOCK; } - cxld->interleave_ways = to_interleave_ways(ctrl); - if (!cxld->interleave_ways) { + rc = cxl_to_ways(FIELD_GET(CXL_HDM_DECODER0_CTRL_IW_MASK, ctrl), + &cxld->interleave_ways); + if (rc) { dev_warn(&port->dev, "decoder%d.%d: Invalid interleave ways (ctrl: %#x)\n", port->id, cxld->id, ctrl); - return -ENXIO; + return rc; } - cxld->interleave_granularity = to_interleave_granularity(ctrl); + rc = cxl_to_granularity(FIELD_GET(CXL_HDM_DECODER0_CTRL_IG_MASK, ctrl), + &cxld->interleave_granularity); + if (rc) + return rc; if (FIELD_GET(CXL_HDM_DECODER0_CTRL_TYPE, ctrl)) cxld->target_type = CXL_DECODER_EXPANDER; diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 6e08fe8cc0fe..fd02f9e2a829 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -64,6 +64,32 @@ static inline int cxl_hdm_decoder_count(u32 cap_hdr) return val ? val * 2 : 1; } +/* Encode defined in CXL 2.0 8.2.5.12.7 HDM Decoder Control Register */ +static inline int cxl_to_granularity(u16 ig, unsigned int *val) +{ + if (ig > 6) + return -EINVAL; + *val = 256 << ig; + return 0; +} + +/* Encode defined in CXL ECN "3, 6, 12 and 16-way memory Interleaving" */ +static inline int cxl_to_ways(u8 eniw, unsigned int *val) +{ + switch (eniw) { + case 0 ... 4: + *val = 1 << eniw; + break; + case 8 ... 10: + *val = 3 << (eniw - 8); + break; + default: + return -EINVAL; + } + + return 0; +} + /* CXL 2.0 8.2.8.1 Device Capabilities Array Register */ #define CXLDEV_CAP_ARRAY_OFFSET 0x0 #define CXLDEV_CAP_ARRAY_CAP_ID 0 From patchwork Fri Jun 24 02:45:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893324 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4F17CCA480 for ; Fri, 24 Jun 2022 02:46:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229923AbiFXCqJ (ORCPT ); Thu, 23 Jun 2022 22:46:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229559AbiFXCqI (ORCPT ); Thu, 23 Jun 2022 22:46:08 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAD8356759; Thu, 23 Jun 2022 19:46:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038766; x=1687574766; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=ES5Q6FuRjJPmaYVv0b5/m9cu+MktkqEe8eUJ+CaqccY=; b=K0HSoL5F+wErHl5/enkqpqRkjORYfeByGLvpn+g5AdOux32qn0Jgw7lb TEKBeN1pg5yR44QCAV3pplyfXvgQrkW36Kp9+gjotC526sX40ZNkopPDP y9vIZ7t8n5fDX/b/UuTws2mvfm44FLxhl1PGPrOD8YNqwJwzIWZeLXNI2 ovSx+H3Oka31z1++O4Qjv/o258OBx8fkUiXBwhRORqV3pGbnxysRoKMTa PTO+HUsAFbXSot/aRYhjxnP7yt13xS38YRCTYpkH3wQ9E7eogyrX/Y/vw /drMNnagyL9Vk38qMJBx7sVuHt2PHSFyKPue3p2C8irfjl/RGqor1lx2H A==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="306370068" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="306370068" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:46:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="563694811" Received: from orsmsx605.amr.corp.intel.com ([10.22.229.18]) by orsmga006.jf.intel.com with ESMTP; 23 Jun 2022 19:46:06 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:46:05 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:46:05 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.43) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:46:05 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eFFfBrmvytb0cN2DEBkKg5X6VSGXvSif8tF/ok8jIGcjvvyLNGNqaq7qVTVxxNM3P2/RSXpLE83XiA4HBYDFFZj6+GVIBKLL5l3P0moqwf8NwgLpIVXvfmoI/MDjMhzTiSdUohtm7hNMz2WAKuJNjlZj5quZ0Bg2HEYvowoGAmdK0Eh0x9v7vHuE8tru10cjYR/w+vi10KrUo1XUxeVVQWu7JqVlnRpFmsVCEsRqfFz5F4O4nDqBsOAZA7nukCMPdiF42y8LpMfWCmYQeuWU7q45iNR1Ix1lwrS+Jjs9V6wwAMoBInJul36rXt8bK7JebTi9VghGgiFvy/n68WYjYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LRN2JaGG1FUtDSBI7L9cppARW+npW1ECWP9Db+sHFiA=; b=VumEbRBI5ybpNaII9CbQVqE/avpRWQMJlLpVbYDY9OhfGR5F/fGcAEA1vStfJufzYZOZP7ffR9npv0RnPL4r+JPFZL5UG2DyAdTvvwO0MFPRtqyaKAqYf7o9v29IvPftd/mGIGWf9auKGnlg5bH5gZNDgppDXKoIZyY5e6MvnkBun9y5grj34U4+Hk93x0U1LfiBqA4oxPHawo1NBuAzDCsKwG09u/xOOm9MqKbmha5VBfHkuGh1UwDx4F/iHfOKKRh+rqr0MrvC3shSDsbJneCFBPnF04AjEQDltFpzCsBQSm/IlGE2cpThgUNmERTxTxxBpfNDq6OdOzU8qYuVLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BYAPR11MB2789.namprd11.prod.outlook.com (2603:10b6:a02:cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Fri, 24 Jun 2022 02:46:03 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:46:03 +0000 Date: Thu, 23 Jun 2022 19:45:57 -0700 From: Dan Williams To: CC: Ben Widawsky , , , , , Subject: [PATCH 08/46] cxl/core: Define a 'struct cxl_switch_decoder' Message-ID: <165603875762.551046.12872423961024324769.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MW2PR2101CA0035.namprd21.prod.outlook.com (2603:10b6:302:1::48) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6236be44-eb78-4126-ce96-08da558baba1 X-MS-TrafficTypeDiagnostic: BYAPR11MB2789:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8wD8A69UTgoDqZkdtYvRo9LxVji/wNdhEd4hcJSVOzlEaV0is+PSIhodHcxLQxZbPpmegcwYEyFKRq1LW6r7L83zVBgyc5iTsmfn2ciFgXx36RV5jkwDVN+bjD4a5lA4qVzI2b9dl8Sveu7B20XgcaIT9qT/RyIeahnEQt33K9xB71X+NnXlOTLEo+tYA/OigUAoPId2gTThMzchzwnpLhdlk+/OF7k19N6KTs5Qoa6cFNMAf2pG0bK6G0QStzKnuF8IfQijHaI9qk0YkAYM15mzcPgd7BSHwRmwyVlMPLDHPuS9/NgRwIGFELlwTYRdKFsr2cv1KWVfZDoucN1l55KHmpHusR3CKs0nLjweJ+so9YIxSwmYKABZqssGk0zLAr7nGrXzXVsZEnIJ5c3igo6TSlqpW09swtvdV0fy9OweoI9TBlQLX2RzwkGEWUnj3Ucp7LXBZrRceKXVyBn5Meve9D5yl9+iJn4IcOU2SfMf+tHxBIgs1i9/OOoFFKREWYoITcdf0qc6vaZJGt/In3BaQS7JTufs0njF3X/KMUnMKpfdaqHKLmtFdBp8tIswaRkNMuzJBL3Jgsa/v0J0HCB0lumz7eFL8xuKvhMpDODyOZzLd/aPl5f081V+JSqvzeCkSXSlhppI677akK6CPZMzMRnFJe9HaYHOgLlQM9ajpC7Y6Z8Mb3ZSvM3BWUqh3qcPBnAkmaabccwOeAgOGDZojGRSLagM/4gfjhCUUOgqqwj79yK4nIC0hk1XFN/A X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(366004)(136003)(39860400002)(396003)(376002)(346002)(8676002)(6506007)(66476007)(66556008)(6666004)(9686003)(82960400001)(33716001)(4326008)(38100700002)(6512007)(66946007)(41300700001)(30864003)(478600001)(316002)(83380400001)(8936002)(86362001)(103116003)(186003)(2906002)(6916009)(6486002)(26005)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sKDB/ZBT+jY1GZ2ohx2CS1fXog0D+sv2iEuYk7D5lyqnQ6y/5ZzzodEw4sZwn5CPX9aBu/eNoTHIN6Cq4Ns2oRUErGVNjX0gr2K0dt1y/qwLUpt4vO8qTFFqUXCTQxwiL1hC0tjoq8E7cgpBkFf42zYbhrO9s6ygnXG2j9XDP2OYnkqv5MFT7A1Zes5rXpq1swnMD/l2YMCeLEDHXL0MbafptBcoO2GB8ByzCJ9iqO2n8sNtO1wSacquGB38X5bfOV4tbZ+Q1yock89pEArrgpfY4RJqHEr7eiTtKbxLVqBmw/X0pFuI69nELv1qgWtwsnXdd2Jj2Suxc/UUioRsi889h85FGYzwy+vMdqelrNEH+nSyLQMbHHN6P1N2SmT5jhtPl07yfD+B58MyNlk3BVkRiVdYSd0ouLkrZ1//3z6IrFc3d8QV39M2FFilVJudZBO9aWRuEOeQdJWp0syQ66NhFNpdJu2/tDEvlK2F7cpFbz3YW6VN9HDtm04TXjwFtOw2vK+TZ+W2pP/Yh+GMiZqH9ZOa6FL7jZRBE5BagNW7HuIebpk0gA0U24g1goiam1NvgBDNyOSuQ8Ll/F74ASB5XYTz3EfPgLPymbJIcE8Pd/PDEq/DVoh31CuzvVUdAXKYFeSKBRq5p0sTTDxDr4AP1GqDJ040+diqG/YxZAH/lPObKsn5rSZmaAvWnu/yWa/ZHAS5jsrX5ZsVIrtZldG9iPHbnXybp9t85WWFvRYrH0ktiQGHjdKXaIHJuNiHlI9wjjIlBc2crLnnNZvxSRIq4hRazkUGWzFjijbCknV6ZslntXEykJ+FWU4gtD3EDdpP9yrJGKTMZVBxOpJCTR6uKxeXrxBU4aI7H0KrxQKwuGMEqZElTyD+h5cSFIIlNEgxYOjjK69HYE5JLmKBR9rQFbG0dg05td2UZLvICtMBATB/s1CLL/wuJPvOPD6VofVXL43BmnYMG5o3BQhW6+RqcAVY3H93/eBJOqvFjowcQYnOXZ3b5JdH7s4lG6zTfdDqQKtPcGUHEPCjaqPvhTA2A9ISXmUCdEmYMGMRFMI0K+LsngoSq+ZAQaKKf65EDuILqjJGMJpD88d98yKPHSOSj/jw0+ctQqHnvLrUhgjGqAAV07B15+nDEE0/o89VSd1QwPb3SFCHu12y2C7/Ouc6V7jSNrgkVEyKd17NxQVqZRUR0HL653PIfJIq1f8EfzwKYsjkvwP6tNIPmVtgBGvY0k1UdWe3SnMn/7ywV02l6Xju7eZy/8IyyQUb2EsimxrVtxFCqMk1ZyBKrLNRTgivHN35GP3OdAdTmsT3yggeB7GFdRbBunJRdyvpjupqNvfvnWT585IC0AehpCwicHUUSqKadN8y9fMIh++dvhMNithvrpZWgbH59QEmhRslbumMiyxm/hRrFdugFd4xabnxD1Xi2MIM9datKHfLtrkUOo6008VnqCp8m78frTrp/XY9osNWcIJtOZT9JQcc0t8vHPq8Jc8G+OwbENeOdmVNhxKeuyFhXWjdrOvAS4TSXIpbFKaEhQNC7ZT3iT3Ku8SifMXV1oD5IcO8VWCXk3u1U2DUG+r2M9vN5SMPGvrIMv5y2nq0Q95mN2TQP8cT9g== X-MS-Exchange-CrossTenant-Network-Message-Id: 6236be44-eb78-4126-ce96-08da558baba1 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:45:59.5763 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +GHnR1cahs3Ppf0jRJWBWIcF1TtGGqpIOXqUfEhwiGhHK0ZxhTYRqiFbCmq1fskRpc/jyBWbG9/99a3l1fg0ZvUtRO/NE8fopyFyLOL6JqE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2789 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Currently 'struct cxl_decoder' contains the superset of attributes needed for all decoder types. Before more type-specific attributes are added to the common definition, reorganize 'struct cxl_decoder' into type specific objects. This patch, the first of three, factors out a cxl_switch_decoder type. The 'switch' decoder type represents the decoder instances of cxl_port's that route from the root of a CXL memory decode topology to the endpoints. They come in two flavors, root-level decoders, statically defined by platform firmware, and mid-level decoders, where interleave-granularity, interleave-width, and the target list are mutable. Co-developed-by: Ben Widawsky Signed-off-by: Ben Widawsky Signed-off-by: Dan Williams --- drivers/cxl/acpi.c | 4 + drivers/cxl/core/hdm.c | 21 +++++--- drivers/cxl/core/port.c | 115 +++++++++++++++++++++++++++++++----------- drivers/cxl/cxl.h | 27 ++++++---- tools/testing/cxl/test/cxl.c | 12 +++- 5 files changed, 128 insertions(+), 51 deletions(-) diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c index 544cb10ce33e..d1b914dfa36c 100644 --- a/drivers/cxl/acpi.c +++ b/drivers/cxl/acpi.c @@ -81,6 +81,7 @@ static int cxl_parse_cfmws(union acpi_subtable_headers *header, void *arg, int target_map[CXL_DECODER_MAX_INTERLEAVE]; struct cxl_cfmws_context *ctx = arg; struct cxl_port *root_port = ctx->root_port; + struct cxl_switch_decoder *cxlsd; struct device *dev = ctx->dev; struct acpi_cedt_cfmws *cfmws; struct cxl_decoder *cxld; @@ -106,10 +107,11 @@ static int cxl_parse_cfmws(union acpi_subtable_headers *header, void *arg, for (i = 0; i < ways; i++) target_map[i] = cfmws->interleave_targets[i]; - cxld = cxl_root_decoder_alloc(root_port, ways); + cxlsd = cxl_root_decoder_alloc(root_port, ways); if (IS_ERR(cxld)) return 0; + cxld = &cxlsd->cxld; cxld->flags = cfmws_to_decoder_flags(cfmws->restrictions); cxld->target_type = CXL_DECODER_EXPANDER; cxld->hpa_range = (struct range) { diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index 46635105a1f1..2d1f3e6eebea 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -46,20 +46,20 @@ static int add_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, */ int devm_cxl_add_passthrough_decoder(struct cxl_port *port) { - struct cxl_decoder *cxld; + struct cxl_switch_decoder *cxlsd; struct cxl_dport *dport; int single_port_map[1]; - cxld = cxl_switch_decoder_alloc(port, 1); - if (IS_ERR(cxld)) - return PTR_ERR(cxld); + cxlsd = cxl_switch_decoder_alloc(port, 1); + if (IS_ERR(cxlsd)) + return PTR_ERR(cxlsd); device_lock_assert(&port->dev); dport = list_first_entry(&port->dports, typeof(*dport), list); single_port_map[0] = dport->port_id; - return add_hdm_decoder(port, cxld, single_port_map); + return add_hdm_decoder(port, &cxlsd->cxld, single_port_map); } EXPORT_SYMBOL_NS_GPL(devm_cxl_add_passthrough_decoder, CXL); @@ -226,8 +226,15 @@ int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) if (is_cxl_endpoint(port)) cxld = cxl_endpoint_decoder_alloc(port); - else - cxld = cxl_switch_decoder_alloc(port, target_count); + else { + struct cxl_switch_decoder *cxlsd; + + cxlsd = cxl_switch_decoder_alloc(port, target_count); + if (IS_ERR(cxlsd)) + cxld = ERR_CAST(cxlsd); + else + cxld = &cxlsd->cxld; + } if (IS_ERR(cxld)) { dev_warn(&port->dev, "Failed to allocate the decoder\n"); diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 13c321afe076..fd1cac13cd2e 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -119,20 +119,21 @@ static ssize_t target_type_show(struct device *dev, } static DEVICE_ATTR_RO(target_type); -static ssize_t emit_target_list(struct cxl_decoder *cxld, char *buf) +static ssize_t emit_target_list(struct cxl_switch_decoder *cxlsd, char *buf) { + struct cxl_decoder *cxld = &cxlsd->cxld; ssize_t offset = 0; int i, rc = 0; for (i = 0; i < cxld->interleave_ways; i++) { - struct cxl_dport *dport = cxld->target[i]; + struct cxl_dport *dport = cxlsd->target[i]; struct cxl_dport *next = NULL; if (!dport) break; if (i + 1 < cxld->interleave_ways) - next = cxld->target[i + 1]; + next = cxlsd->target[i + 1]; rc = sysfs_emit_at(buf, offset, "%d%s", dport->port_id, next ? "," : ""); if (rc < 0) @@ -143,18 +144,20 @@ static ssize_t emit_target_list(struct cxl_decoder *cxld, char *buf) return offset; } +static struct cxl_switch_decoder *to_cxl_switch_decoder(struct device *dev); + static ssize_t target_list_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct cxl_decoder *cxld = to_cxl_decoder(dev); + struct cxl_switch_decoder *cxlsd = to_cxl_switch_decoder(dev); ssize_t offset; unsigned int seq; int rc; do { - seq = read_seqbegin(&cxld->target_lock); - rc = emit_target_list(cxld, buf); - } while (read_seqretry(&cxld->target_lock, seq)); + seq = read_seqbegin(&cxlsd->target_lock); + rc = emit_target_list(cxlsd, buf); + } while (read_seqretry(&cxlsd->target_lock, seq)); if (rc < 0) return rc; @@ -232,14 +235,28 @@ static const struct attribute_group *cxl_decoder_endpoint_attribute_groups[] = { NULL, }; +static void __cxl_decoder_release(struct cxl_decoder *cxld) +{ + struct cxl_port *port = to_cxl_port(cxld->dev.parent); + + ida_free(&port->decoder_ida, cxld->id); + put_device(&port->dev); +} + static void cxl_decoder_release(struct device *dev) { struct cxl_decoder *cxld = to_cxl_decoder(dev); - struct cxl_port *port = to_cxl_port(dev->parent); - ida_free(&port->decoder_ida, cxld->id); + __cxl_decoder_release(cxld); kfree(cxld); - put_device(&port->dev); +} + +static void cxl_switch_decoder_release(struct device *dev) +{ + struct cxl_switch_decoder *cxlsd = to_cxl_switch_decoder(dev); + + __cxl_decoder_release(&cxlsd->cxld); + kfree(cxlsd); } static const struct device_type cxl_decoder_endpoint_type = { @@ -250,13 +267,13 @@ static const struct device_type cxl_decoder_endpoint_type = { static const struct device_type cxl_decoder_switch_type = { .name = "cxl_decoder_switch", - .release = cxl_decoder_release, + .release = cxl_switch_decoder_release, .groups = cxl_decoder_switch_attribute_groups, }; static const struct device_type cxl_decoder_root_type = { .name = "cxl_decoder_root", - .release = cxl_decoder_release, + .release = cxl_switch_decoder_release, .groups = cxl_decoder_root_attribute_groups, }; @@ -271,15 +288,29 @@ bool is_root_decoder(struct device *dev) } EXPORT_SYMBOL_NS_GPL(is_root_decoder, CXL); +static bool is_switch_decoder(struct device *dev) +{ + return is_root_decoder(dev) || dev->type == &cxl_decoder_switch_type; +} + struct cxl_decoder *to_cxl_decoder(struct device *dev) { - if (dev_WARN_ONCE(dev, dev->type->release != cxl_decoder_release, + if (dev_WARN_ONCE(dev, + !is_switch_decoder(dev) && !is_endpoint_decoder(dev), "not a cxl_decoder device\n")) return NULL; return container_of(dev, struct cxl_decoder, dev); } EXPORT_SYMBOL_NS_GPL(to_cxl_decoder, CXL); +static struct cxl_switch_decoder *to_cxl_switch_decoder(struct device *dev) +{ + if (dev_WARN_ONCE(dev, !is_switch_decoder(dev), + "not a cxl_switch_decoder device\n")) + return NULL; + return container_of(dev, struct cxl_switch_decoder, cxld.dev); +} + static void cxl_ep_release(struct cxl_ep *ep) { if (!ep) @@ -1129,7 +1160,7 @@ struct cxl_dport *cxl_find_dport_by_dev(struct cxl_port *port, } EXPORT_SYMBOL_NS_GPL(cxl_find_dport_by_dev, CXL); -static int decoder_populate_targets(struct cxl_decoder *cxld, +static int decoder_populate_targets(struct cxl_switch_decoder *cxlsd, struct cxl_port *port, int *target_map) { int i, rc = 0; @@ -1142,17 +1173,17 @@ static int decoder_populate_targets(struct cxl_decoder *cxld, if (list_empty(&port->dports)) return -EINVAL; - write_seqlock(&cxld->target_lock); - for (i = 0; i < cxld->nr_targets; i++) { + write_seqlock(&cxlsd->target_lock); + for (i = 0; i < cxlsd->nr_targets; i++) { struct cxl_dport *dport = find_dport(port, target_map[i]); if (!dport) { rc = -ENXIO; break; } - cxld->target[i] = dport; + cxlsd->target[i] = dport; } - write_sequnlock(&cxld->target_lock); + write_sequnlock(&cxlsd->target_lock); return rc; } @@ -1179,13 +1210,27 @@ static struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, { struct cxl_decoder *cxld; struct device *dev; + void *alloc; int rc = 0; if (nr_targets > CXL_DECODER_MAX_INTERLEAVE) return ERR_PTR(-EINVAL); - cxld = kzalloc(struct_size(cxld, target, nr_targets), GFP_KERNEL); - if (!cxld) + if (nr_targets) { + struct cxl_switch_decoder *cxlsd; + + alloc = kzalloc(struct_size(cxlsd, target, nr_targets), GFP_KERNEL); + cxlsd = alloc; + if (cxlsd) { + cxlsd->nr_targets = nr_targets; + seqlock_init(&cxlsd->target_lock); + cxld = &cxlsd->cxld; + } + } else { + alloc = kzalloc(sizeof(*cxld), GFP_KERNEL); + cxld = alloc; + } + if (!alloc) return ERR_PTR(-ENOMEM); rc = ida_alloc(&port->decoder_ida, GFP_KERNEL); @@ -1196,8 +1241,6 @@ static struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, get_device(&port->dev); cxld->id = rc; - cxld->nr_targets = nr_targets; - seqlock_init(&cxld->target_lock); dev = &cxld->dev; device_initialize(dev); lockdep_set_class(&dev->mutex, &cxl_decoder_key); @@ -1222,7 +1265,7 @@ static struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, return cxld; err: - kfree(cxld); + kfree(alloc); return ERR_PTR(rc); } @@ -1236,13 +1279,18 @@ static struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, * firmware description of CXL resources into a CXL standard decode * topology. */ -struct cxl_decoder *cxl_root_decoder_alloc(struct cxl_port *port, - unsigned int nr_targets) +struct cxl_switch_decoder *cxl_root_decoder_alloc(struct cxl_port *port, + unsigned int nr_targets) { + struct cxl_decoder *cxld; + if (!is_cxl_root(port)) return ERR_PTR(-EINVAL); - return cxl_decoder_alloc(port, nr_targets); + cxld = cxl_decoder_alloc(port, nr_targets); + if (IS_ERR(cxld)) + return ERR_CAST(cxld); + return to_cxl_switch_decoder(&cxld->dev); } EXPORT_SYMBOL_NS_GPL(cxl_root_decoder_alloc, CXL); @@ -1257,13 +1305,18 @@ EXPORT_SYMBOL_NS_GPL(cxl_root_decoder_alloc, CXL); * that sit between Switch Upstream Ports / Switch Downstream Ports and * Host Bridges / Root Ports. */ -struct cxl_decoder *cxl_switch_decoder_alloc(struct cxl_port *port, - unsigned int nr_targets) +struct cxl_switch_decoder *cxl_switch_decoder_alloc(struct cxl_port *port, + unsigned int nr_targets) { + struct cxl_decoder *cxld; + if (is_cxl_root(port) || is_cxl_endpoint(port)) return ERR_PTR(-EINVAL); - return cxl_decoder_alloc(port, nr_targets); + cxld = cxl_decoder_alloc(port, nr_targets); + if (IS_ERR(cxld)) + return ERR_CAST(cxld); + return to_cxl_switch_decoder(&cxld->dev); } EXPORT_SYMBOL_NS_GPL(cxl_switch_decoder_alloc, CXL); @@ -1320,7 +1373,9 @@ int cxl_decoder_add_locked(struct cxl_decoder *cxld, int *target_map) port = to_cxl_port(cxld->dev.parent); if (!is_endpoint_decoder(dev)) { - rc = decoder_populate_targets(cxld, port, target_map); + struct cxl_switch_decoder *cxlsd = to_cxl_switch_decoder(dev); + + rc = decoder_populate_targets(cxlsd, port, target_map); if (rc && (cxld->flags & CXL_DECODER_F_ENABLE)) { dev_err(&port->dev, "Failed to populate active decoder targets\n"); diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index fd02f9e2a829..7525b55b11bb 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -220,7 +220,7 @@ enum cxl_decoder_type { #define CXL_DECODER_MAX_INTERLEAVE 16 /** - * struct cxl_decoder - CXL address range decode configuration + * struct cxl_decoder - Common CXL HDM Decoder Attributes * @dev: this decoder's device * @id: kernel device name id * @hpa_range: Host physical address range mapped by this decoder @@ -228,10 +228,7 @@ enum cxl_decoder_type { * @interleave_granularity: data stride per dport * @target_type: accelerator vs expander (type2 vs type3) selector * @flags: memory type capabilities and locking - * @target_lock: coordinate coherent reads of the target list - * @nr_targets: number of elements in @target - * @target: active ordered target list in current decoder configuration - */ +*/ struct cxl_decoder { struct device dev; int id; @@ -240,12 +237,22 @@ struct cxl_decoder { int interleave_granularity; enum cxl_decoder_type target_type; unsigned long flags; +}; + +/** + * struct cxl_switch_decoder - Switch specific CXL HDM Decoder + * @cxld: base cxl_decoder object + * @target_lock: coordinate coherent reads of the target list + * @nr_targets: number of elements in @target + * @target: active ordered target list in current decoder configuration + */ +struct cxl_switch_decoder { + struct cxl_decoder cxld; seqlock_t target_lock; int nr_targets; struct cxl_dport *target[]; }; - /** * enum cxl_nvdimm_brige_state - state machine for managing bus rescans * @CXL_NVB_NEW: Set at bridge create and after cxl_pmem_wq is destroyed @@ -363,10 +370,10 @@ struct cxl_dport *cxl_find_dport_by_dev(struct cxl_port *port, struct cxl_decoder *to_cxl_decoder(struct device *dev); bool is_root_decoder(struct device *dev); bool is_endpoint_decoder(struct device *dev); -struct cxl_decoder *cxl_root_decoder_alloc(struct cxl_port *port, - unsigned int nr_targets); -struct cxl_decoder *cxl_switch_decoder_alloc(struct cxl_port *port, - unsigned int nr_targets); +struct cxl_switch_decoder *cxl_root_decoder_alloc(struct cxl_port *port, + unsigned int nr_targets); +struct cxl_switch_decoder *cxl_switch_decoder_alloc(struct cxl_port *port, + unsigned int nr_targets); int cxl_decoder_add(struct cxl_decoder *cxld, int *target_map); struct cxl_decoder *cxl_endpoint_decoder_alloc(struct cxl_port *port); int cxl_decoder_add_locked(struct cxl_decoder *cxld, int *target_map); diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c index 7a08b025f2de..68288354b419 100644 --- a/tools/testing/cxl/test/cxl.c +++ b/tools/testing/cxl/test/cxl.c @@ -451,9 +451,15 @@ static int mock_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) struct cxl_decoder *cxld; int rc; - if (target_count) - cxld = cxl_switch_decoder_alloc(port, target_count); - else + if (target_count) { + struct cxl_switch_decoder *cxlsd; + + cxlsd = cxl_switch_decoder_alloc(port, target_count); + if (IS_ERR(cxlsd)) + cxld = ERR_CAST(cxlsd); + else + cxld = &cxlsd->cxld; + } else cxld = cxl_endpoint_decoder_alloc(port); if (IS_ERR(cxld)) { dev_warn(&port->dev, From patchwork Fri Jun 24 02:46:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893325 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 821E6C43334 for ; Fri, 24 Jun 2022 02:46:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229547AbiFXCqR (ORCPT ); Thu, 23 Jun 2022 22:46:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229499AbiFXCqQ (ORCPT ); Thu, 23 Jun 2022 22:46:16 -0400 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9597456C1A; Thu, 23 Jun 2022 19:46:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038775; x=1687574775; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=UuGrHny67EcriTNUGmCqxqKEAsElauQ4LgH89uYtwsY=; b=lIc1xWmL+TfO+y7mlUJwp6iYs+PBuEsGgXE83w2zIGHpFWURtK5Osj/K To1a3wbRzAGGhS8xlkZOkN5ExEendWQYJksLvau1LQxosWULN0SrvFZ18 uCy/6Z6KPtPH4wmrF7pxuSxzBITvFwFQrkwuanBylj1/wI85AZajLMkHu LsJmy33kEBtvxuIX74Q9GQ9D6YvssWXPYwTBfvZ1izJGiMqY5nFsy/yPD OJSX1i1PQvV5VN/DUNGMl3f58Z11vriYFOfrkNTJ/14f6VVj1OVxzDivb FieJ3+cwRTbEAVpPQy8i0+dmdSAFNkjtBIoGYXLLlrdceL1Xe9qlBZFFI Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="278453424" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="278453424" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:46:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="678351770" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by FMSMGA003.fm.intel.com with ESMTP; 23 Jun 2022 19:46:15 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX606.amr.corp.intel.com (10.22.229.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:46:14 -0700 Received: from orsmsx605.amr.corp.intel.com (10.22.229.18) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:46:14 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:46:14 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.48) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:46:14 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hoj0j3QLZKxCDC9hpcYh4V2vXAjHd1nbxdAqk1FiHFBVJ5SMpr4ZyGo68bW1e3c8CxMNAMsArUaZ4NWN6C0G2zgWkdyAnKictR4oHSYCoT+dWFTk8IHKwdhDnBbjSNDm05uXVMs9L00jCqLDJuJnk5Q1/IxmCYRp3TMkzChzTgMZjPFI/FWIiYoVtKDyy/tpUsw6tvcb3lrINvXP/l+kLd6m9Zz1i+uJrJPOVKUXPtoWekgBGQIBWCFE47aAsAJmbzrO55FBTcpPVcA6bdGWCTdPSsCL90hNZP2f5Z4F9BVfLuy6DdCpq2bA+h6TvYrWWPkBqdvNfxoDAl8iZ/YIVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IjODh95hfxS5/uvvawpYC+4SICNbMQ5wGFwQMZCWAWQ=; b=KPLtW3GFZfDsknBuOIc5rJ3WqCIID5lY0szWeEQj0Grh800XqXpy6AGqucOZRfzaOyo9juu+wgo9Vxzbjwm6rDWycxHp3NlaSC32jyA1Y34ioMjt11zvPjY+G2+odZCeGp7wMeokGLEmEBysrk09ONz3JEFLAsXyiO3a4nM10lBqo6IhRL67E7u8q27mwSKNiSL2gRCudRvjQT9Yczr2BiCB5oiBj7XXj2OC+DtT5Dxa816lOWZ5tBLsgxMMtStfhr387Gv8V1GbMuNGv4BaVd2Qh5rMh54j+cl3pFfDU7gGBy4hw+FYDDerjcfGB6pIUvG91QLIhlsB5OWZG4TG4w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BYAPR11MB2789.namprd11.prod.outlook.com (2603:10b6:a02:cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Fri, 24 Jun 2022 02:46:12 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:46:12 +0000 Date: Thu, 23 Jun 2022 19:46:05 -0700 From: Dan Williams To: CC: , , , , Subject: [PATCH 09/46] cxl/acpi: Track CXL resources in iomem_resource Message-ID: <165603876550.551046.11015869763159096807.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MW4PR04CA0265.namprd04.prod.outlook.com (2603:10b6:303:88::30) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eb9fe7c8-fe8f-43df-ddbb-08da558bb03d X-MS-TrafficTypeDiagnostic: BYAPR11MB2789:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DAFqwQYqAgLnzBKP9vEReSDJdYDiEhnanH2sjlb3WANLfz5CI8uPOy7qTORZvvTcae2wkTYd20h0YUsh/iAdZPufK9kemGabsjFdnNiI6XWN4uEAPt5Z7ejZklz0TS2o829n665wF8HSq3Xz0T/Hcu+NfZmlUtnFPdGNqpsNarrDHYbPS9udvKDQiyYnfHsG5PjW7TV4jGUyyqi4jRyH3e4+BhEwrenceJydvd+TVSe0Ekinc9fn7BvUcu5m1kT90L7sYEjRjMZp6PmCq2JrFhP8syE+iz5zd6WHOe4Bzh5zHaMxsyVbuYqj3e/GMN5RUiuCyIIh35AcLyx8kESsn8dQvUEDSr5k88g5Kw0fjcJE/eY6MSP92w27TRwHp2jdpuScSGdS6ZkDXF8HNAG4UaZ//V48JGw2WSk7lq4+XFjA9YPzRqJMB11LcP5gK7clZT8kJ83hnZ4sFiIeKPJLHmBiUopbCg2M9mQHq4WhoXfFVjL6TVERVIBAkSCdSsS4l1IYxJzmuHSFNbDvLzzwams293q5vWDQIjoxFRYFd1urORwxNeRAO+bgHdXopCVUZ4j34SaFR8pPkM1CaA5tWCnJZ+Los30hIfdMxDQ2C+Vb8FZx34H7sNhfVE4aooxKihAuIa7MEq734dXzbS/bYGoo7ebQArksaNX/VPnbovU3vVZxggzqNls+46f9kJ0vuU3nJNlfMd0XQR4IeV32VNrFcoa21AJPyVi/N19PNzrK/hLgV3E6GTjsCIUGQ0IK X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(366004)(136003)(39860400002)(396003)(376002)(346002)(8676002)(6506007)(66476007)(66556008)(6666004)(9686003)(82960400001)(33716001)(4326008)(38100700002)(6512007)(66946007)(41300700001)(478600001)(316002)(83380400001)(8936002)(86362001)(103116003)(186003)(2906002)(6916009)(6486002)(26005)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7Y7qFgcY07FZEnAv5mAoa4alzr+cXzTSNXxfY7ufVyzEIMRe+1zBwC+dLYdoSUCCm5RaOEzmTweLCtxsETEVEdpZVBiIIl97P3w33XaB07aXHRq8BlrM8awnEriUxFdpjUtIW2tvYXwttegPrDxAxxZKjh2jeNgnbiBpPlRa5W0emNrS3BuGNg2M3mkjXN6KvvXgyOP+7D696VYasSdHv01C8LAoaf9tYyf4Y74rzOn1YfjFHMV1ehAw/zIwY4Gobsy8iANJFAGaxgv9FwkMvAHgjtc72fNNHm/Xup2toZri1lXjkkG5AdT2LdmE+RtPctdJNQbqoJwNRiJQbs8i7rpZwo346pYGp9NsDmmXdq53cFCd6aXDCYbuLxijKX3+MbqQBrcWvuDWrwtWy+wDNnxqlJNSlPmb+8O/vuYSVeja+vgOhwxT0uLbCEzm8VUwV7FH2eIDcv9rdB51rM23AmtC9stA8IzyKcMEr6BONnMwQHzUs+NUoIpiawOhp0QKJbSpBTpTu1iMzqHiozkKizlfXiwgEi8QAgJabpeVmqt5fEIApe+YOVvZYmUPQ/zl/B5bHqMhDVb2++AaIinKia8DhKDVHIkIoo0Q6eVhwmH61g3QHqduc2GkPbc4BDmGAIz6B0hwk63R04fGQKHP3TAtGSjam4qRMecVNsopNL/IYEEP33ntDyAMYSwCTuaUPDUuTIF5sqCQV2gh9ozBE83qCOnXEzrfLOrVbGiH829ERecDqChhGEDUyb2kRDtYzbMJRyfFP4DnOGTN6RZIMOraTWcyjnO70zUWRL40g1rOvfhEWeJCDHtcLnh7gViJUteiuLGTT/wZJcMZVLTIZ+2iB3jxHsFKFzw4enG237q4XJv8glOFkh/B7Mu2hW99GdPCT7K65hICITJvTbsRkoKP1IhNES6ampR5NkMOwWi2X+6xjptM0b4Uw9EQcCGSetke0AFAQdYy6oTYy+qgVA+0aCVo3rVR0k45syedell39qwBugEe8mBPurzaar6O4YwBhciSi8IFAOgFq1VyOaGP7tnwj6XIqDedVZ0MOQm4bQcFXyNi2WMwFoF7eD8zOwhkBbGxVmuoRstUgEnwy4Dac6PtQFrsrpN7wB05BwdmxhJVlwwQNJOl+8WTAVcd8vvbrNAqV/E8BEWx/i4BYhY+4J4jPUtwF9IbaLaf6JGicZeTPDAPSUxh45phP+kuOdSKIwRqeBBfW22rPZmXntCeSy09N0aGNSUAIiip/PVJo5qXYEyEF/5bf367GEzWqAgrAii9Es9jLEdiI1cRsmbjPwsbzq80jXfI20CzBMSPR2dbyxMdfOBa2Q3E1iHUvdUIGAO7r6st8ALpeJ/XpFjUZ2XMI98Z6vklAHr5gs6aBH829gvMFgaZt1COOcD+Hr+CR6kzPTN8CNaBmaQFRwTLQxKgjps21ZlU5OdnyG3EHr7u0EctzFGnhU946prnJOttq1ufgOcgP8cAhV5DeKBNhTy0UE4XH0ByrmqLjETIXKEMSDBh5U5WI614qEN/o1xpD2y38wKOgxLJNdrVPwKUn1lORCI+DFsLLT1bGEcEtSHnCZjX5QqW9C0kVtr5x+bFjUMch1j0ai6eQIdoKQ== X-MS-Exchange-CrossTenant-Network-Message-Id: eb9fe7c8-fe8f-43df-ddbb-08da558bb03d X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:46:07.3412 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: soPvrOCuSP3RM0iH3ofSnJ0DRPWKqB2llGpltUD+v6EP1N5+Fp1klSai0xQKHNRL+Fty/kY2CUCKmEehTjMcXnrcAdcMZpnjyXQK+yz76Ag= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2789 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Recall that CXL capable address ranges, on ACPI platforms, are published in the CEDT.CFMWS (CXL Early Discovery Table - CXL Fixed Memory Window Structures). These windows represent both the actively mapped capacity and the potential address space that can be dynamically assigned to a new CXL decode configuration. CXL endpoints like DDR DIMMs can be mapped at any physical address including 0 and legacy ranges. There is an expectation and requirement that the /proc/iomem interface and the iomem_resource in the kernel reflect the full set of platform address ranges. I.e. that every address range that platform firmware and bus drivers enumerate be reflected as an iomem_resource entry. The hard requirement to do this for CXL arises from the fact that capabilities like CONFIG_DEVICE_PRIVATE expect to be able to treat empty iomem_resource ranges as free for software to use as proxy address space. Without CXL publishing its potential address ranges in iomem_resource, the CONFIG_DEVICE_PRIVATE mechanism may inadvertently steal capacity reserved for runtime provisioning of new CXL regions. The approach taken supports dynamically publishing the CXL window map on demand when a CXL platform driver like cxl_acpi loads. The windows are then forced into the first level of iomem_resource tree via the insert_resource_expand_to_fit() API. This forcing sacrifices some resource boundary accurracy in order to better reflect the decode hierarchy of a CXL window hosting "System RAM" and other resources. Walkers of the iomem_resource tree will also need to have access to the related 'struct cxl_decoder' instances to disambiguate which portions of a CXL memory resource are present vs expanded to enforce the expected resource topology. Signed-off-by: Dan Williams --- drivers/cxl/acpi.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++- kernel/resource.c | 7 +++ 2 files changed, 114 insertions(+), 3 deletions(-) diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c index d1b914dfa36c..003fa4fde357 100644 --- a/drivers/cxl/acpi.c +++ b/drivers/cxl/acpi.c @@ -73,6 +73,7 @@ static int cxl_acpi_cfmws_verify(struct device *dev, struct cxl_cfmws_context { struct device *dev; struct cxl_port *root_port; + int id; }; static int cxl_parse_cfmws(union acpi_subtable_headers *header, void *arg, @@ -84,8 +85,10 @@ static int cxl_parse_cfmws(union acpi_subtable_headers *header, void *arg, struct cxl_switch_decoder *cxlsd; struct device *dev = ctx->dev; struct acpi_cedt_cfmws *cfmws; + struct resource *cxl_res; struct cxl_decoder *cxld; unsigned int ways, i, ig; + struct resource *res; int rc; cfmws = (struct acpi_cedt_cfmws *) header; @@ -107,6 +110,24 @@ static int cxl_parse_cfmws(union acpi_subtable_headers *header, void *arg, for (i = 0; i < ways; i++) target_map[i] = cfmws->interleave_targets[i]; + res = kzalloc(sizeof(*res), GFP_KERNEL); + if (!res) + return -ENOMEM; + + res->name = kasprintf(GFP_KERNEL, "CXL Window %d", ctx->id++); + if (!res->name) + goto err_name; + + res->start = cfmws->base_hpa; + res->end = cfmws->base_hpa + cfmws->window_size - 1; + res->flags = IORESOURCE_MEM; + + /* add to the local resource tracking to establish a sort order */ + cxl_res = dev_get_drvdata(&root_port->dev); + rc = insert_resource(cxl_res, res); + if (rc) + goto err_insert; + cxlsd = cxl_root_decoder_alloc(root_port, ways); if (IS_ERR(cxld)) return 0; @@ -115,8 +136,8 @@ static int cxl_parse_cfmws(union acpi_subtable_headers *header, void *arg, cxld->flags = cfmws_to_decoder_flags(cfmws->restrictions); cxld->target_type = CXL_DECODER_EXPANDER; cxld->hpa_range = (struct range) { - .start = cfmws->base_hpa, - .end = cfmws->base_hpa + cfmws->window_size - 1, + .start = res->start, + .end = res->end, }; cxld->interleave_ways = ways; cxld->interleave_granularity = ig; @@ -131,12 +152,19 @@ static int cxl_parse_cfmws(union acpi_subtable_headers *header, void *arg, cxld->hpa_range.start, cxld->hpa_range.end); return 0; } + dev_dbg(dev, "add: %s node: %d range [%#llx - %#llx]\n", dev_name(&cxld->dev), phys_to_target_node(cxld->hpa_range.start), cxld->hpa_range.start, cxld->hpa_range.end); return 0; + +err_insert: + kfree(res->name); +err_name: + kfree(res); + return -ENOMEM; } __mock struct acpi_device *to_cxl_host_bridge(struct device *host, @@ -291,9 +319,66 @@ static void cxl_acpi_lock_reset_class(void *dev) device_lock_reset_class(dev); } +static void del_cxl_resource(struct resource *res) +{ + kfree(res->name); + kfree(res); +} + +static void remove_cxl_resources(void *data) +{ + struct resource *res, *next, *cxl = data; + + for (res = cxl->child; res; res = next) { + struct resource *victim = (struct resource *) res->desc; + + next = res->sibling; + remove_resource(res); + + if (victim) { + remove_resource(victim); + kfree(victim); + } + + del_cxl_resource(res); + } +} + +static int add_cxl_resources(struct resource *cxl) +{ + struct resource *res, *new, *next; + + for (res = cxl->child; res; res = next) { + new = kzalloc(sizeof(*new), GFP_KERNEL); + if (!new) + return -ENOMEM; + new->name = res->name; + new->start = res->start; + new->end = res->end; + new->flags = IORESOURCE_MEM; + res->desc = (unsigned long) new; + + insert_resource_expand_to_fit(&iomem_resource, new); + + next = res->sibling; + while (next && resource_overlaps(new, next)) { + if (resource_contains(new, next)) { + struct resource *_next = next->sibling; + + remove_resource(next); + del_cxl_resource(next); + next = _next; + } else + next->start = new->end + 1; + } + } + return 0; +} + static int cxl_acpi_probe(struct platform_device *pdev) { int rc; + struct resource *cxl_res; struct cxl_port *root_port; struct device *host = &pdev->dev; struct acpi_device *adev = ACPI_COMPANION(host); @@ -305,21 +390,40 @@ static int cxl_acpi_probe(struct platform_device *pdev) if (rc) return rc; + cxl_res = devm_kzalloc(host, sizeof(*cxl_res), GFP_KERNEL); + if (!cxl_res) + return -ENOMEM; + cxl_res->name = "CXL mem"; + cxl_res->start = 0; + cxl_res->end = -1; + cxl_res->flags = IORESOURCE_MEM; + root_port = devm_cxl_add_port(host, host, CXL_RESOURCE_NONE, NULL); if (IS_ERR(root_port)) return PTR_ERR(root_port); dev_dbg(host, "add: %s\n", dev_name(&root_port->dev)); + dev_set_drvdata(&root_port->dev, cxl_res); rc = bus_for_each_dev(adev->dev.bus, NULL, root_port, add_host_bridge_dport); if (rc < 0) return rc; + rc = devm_add_action_or_reset(host, remove_cxl_resources, cxl_res); + if (rc) + return rc; + ctx = (struct cxl_cfmws_context) { .dev = host, .root_port = root_port, }; - acpi_table_parse_cedt(ACPI_CEDT_TYPE_CFMWS, cxl_parse_cfmws, &ctx); + rc = acpi_table_parse_cedt(ACPI_CEDT_TYPE_CFMWS, cxl_parse_cfmws, &ctx); + if (rc < 0) + return -ENXIO; + + rc = add_cxl_resources(cxl_res); + if (rc) + return rc; /* * Root level scanned with host-bridge as dports, now scan host-bridges diff --git a/kernel/resource.c b/kernel/resource.c index 34eaee179689..53a534db350e 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -891,6 +891,13 @@ void insert_resource_expand_to_fit(struct resource *root, struct resource *new) } write_unlock(&resource_lock); } +/* + * Not for general consumption, only early boot memory map parsing, PCI + * resource discovery, and late discovery of CXL resources are expected + * to use this interface. The former are built-in and only the latter, + * CXL, is a module. + */ +EXPORT_SYMBOL_NS_GPL(insert_resource_expand_to_fit, CXL); /** * remove_resource - Remove a resource in the resource tree From patchwork Fri Jun 24 02:46:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893326 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6CE1CC43334 for ; Fri, 24 Jun 2022 02:46:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229499AbiFXCq3 (ORCPT ); Thu, 23 Jun 2022 22:46:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229925AbiFXCq1 (ORCPT ); Thu, 23 Jun 2022 22:46:27 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F0D356C35; Thu, 23 Jun 2022 19:46:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038785; x=1687574785; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=VGzfgn4j+cvzo52W4P5voHaM52wBsUdnDl5FXnJpV9U=; b=DpQ4cyNVn/xtp/BxFKcU3d3G+R7VtMfIjNjNaIh+wdfGFDsnZnH+F/Q4 fOwqOI2aPyZYBzvFPUVj3trns0NMhrSD2fThK19AVDGJNNyM5mBYz7JD6 CHF9SK8TQWkQtbDdOOMTZgJ7M3R50/0V2UrqJ92TtVL0RX3dwDl7oPTk7 PsKuhgUcCnLPffHiqSQ/Xi0j81l+ICVrvhY+rIC4PScn1eh2kV2QP5rrz u2almKmV9YgCkFcE4W6WIIwGqqTCloF6GKCi1MusSPOVgllxiQi8iH5BJ rVpvqs9D/WWLjJO0Z/GRxHpgqJP7LGOfzhBTr8z+moMpATQ4V1BzofJqe w==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="281636682" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="281636682" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:46:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="678351820" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by FMSMGA003.fm.intel.com with ESMTP; 23 Jun 2022 19:46:24 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:46:24 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:46:24 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.42) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:46:23 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fV5M+CeDbNVwwebQ3ZTJvWdy42n+j5p9ID4I2YKw6MT0nBP/ogr+OOxO5oNWd7XgeNQaXGGtEpxFW6Lcy72Vft2AydJXwEEcvGJ/RQvc1wWVoFmWjwlSt12l0WAByEex6isL0h92T2E8Sicvd/25uLZO/wzhaXqasjUioiVOrtsnsH37O7yySQiQv2duCWOg//iCKAqpoTQJD9zcqbYVjQmNoioZ3tIEpk+Pnp0Ahz/ANMI4sd3HQvm213hCBLpgk+xeApPUvg/VuqOG3czbbt4USdFc98eF/qTBFYCkGQXtXOPi/A4zYdFYWx2mQnkCO+YBrm+92DSJASARi3qiiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=171NWBtKaPm5nSeXoPousOa4CXQP9Cpm2WgeN21ciYs=; b=MYO82k0CKLHyEdd/Bnr9d5HuCEAjm4dQIweLrsMxeWTpziba5Ip3IwQgbEvc4jt3WsMwZ28SFy/HoGT5XJABMCKXfxUBr0JwRiDSqXXxFoRXFTPOH0MRxcYtURVY13zWt2k85zPWkNYW+4n+YrUOiG4sgmmfbjExSeg9zRwXpxl4VmEphfuYZW/sZxpC3AI+wyZ2AzxwAMcEUmT1rB7UgDiBdmb7v4PNfUQM59yvH4c6vVIuW2if1ckx6u3w35GjmgsPM+7u4Dh0yBlGb9GJD96FXRKELHy32IDgN+UcPsAKAotmYN36wApdpQ7eDDkGfDYUyoxOf1NKYwYt3jFs8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BYAPR11MB2789.namprd11.prod.outlook.com (2603:10b6:a02:cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Fri, 24 Jun 2022 02:46:21 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:46:21 +0000 Date: Thu, 23 Jun 2022 19:46:13 -0700 From: Dan Williams To: CC: Ben Widawsky , , , , , Subject: [PATCH 10/46] cxl/core: Define a 'struct cxl_root_decoder' for tracking CXL window resources Message-ID: <165603877351.551046.12325060612893557716.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MW4PR04CA0052.namprd04.prod.outlook.com (2603:10b6:303:6a::27) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 46ad0e6a-a411-48f8-af55-08da558bb4fd X-MS-TrafficTypeDiagnostic: BYAPR11MB2789:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f1ZKApUkUozfk7SJQtrJYvxyLkjAqoojU8CFZm5xredGa3M7bzC8LH0X52RDHd1DxNN21LAeEoGbcdKnI9XKn4wdH9qt3l03fmJwqT0Zpt17k1da9PydQKlTNycHGP50UVrMOUzC8GznUy76/eZUu5IWQYX2tje/llPL40CciIdfPLfgTqoWXvw+wbl5QvcYJiAMVhfgdMcwhbJ7NT3Z7Rg9rxhV4GG2Kqmbm+3zVUpZCpLoDzVu53F+rlpU5vNfpVIGS0oJc9eFsv8aPE8tUw5pvpxLYvm0UdgBW/8jQ6DcWQhnlN4FrPXXQam+0gI8Qr68ErohMVhAMAJs48sXrap//ycHY0m2NhcaM0t9UVpEfYhZGY4LFsS5Ubkv7oKZ9fkQ9Jna4S3cyYQWWryoYe8NFfK3u20dtdbHiix5lGoHw7RrNpnCq43H5k6HXSjUY/bg+BeOLjYsma8gPy80TRz6NbNGMVOjyqENjQxoci6Mpj/uqv6fsw1jgckIsrbwrgLst/uh85mWHZDLlcPm4C7nx//bVo0L5w0XMtMGWnC80H4SxEaopkGc8QsE+Fvaw6TSsm14TwXmfuBXgNurptl0SoVcC41OofCeDRyH8R4h4+V6Ln6mVfQT1tjD9GARpEzsVofeOp1PD24lOIdWgmeusXkwt+2Yn3xjosZiIu50OVyJw6fWIYGUBNKw1kC0A6kkR7H9ZBICzJ7FYJrvsW7N+impD81cHWEcYZPlHoQA6ymptg1faou1Xhxmi2jl X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(366004)(136003)(39860400002)(396003)(376002)(346002)(8676002)(6506007)(66476007)(66556008)(6666004)(9686003)(82960400001)(33716001)(4326008)(38100700002)(6512007)(66946007)(41300700001)(478600001)(316002)(83380400001)(8936002)(86362001)(103116003)(186003)(2906002)(6916009)(6486002)(26005)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: INkuCRMje/7Z0ZV2VNs9spJDGX/M9AbgnzY4Jg9T2wTjubdfm9s3u1FcFEugwPLH0ynf4Y8H1x6rwN2EaPN+j/inVVpGHxGKlpomvVF+7n5w1PN76EfFd27zGGDjf/OdfXdSfSGQmDdGkud3QNQ2kFDzlZgyb/dVbZHd5nBs6hozEpiSSXbqJUAY+GmhFv7J4ud2rLDHoNpYNihRExQT4zwDDZZ88TZkosGtRLpIfTrqqKUuAHXKLMcfTZHb7fTqX5A+DUFlyb0az4EJKhpDe8lEe4g4XXtT6w8hUpx2Du8NkEI6adtchb6D9YS/01ZMZKz/Ubqq3eJ3ivnB19UsRRBuWvciK1+QGBHiq0sjHaP8kArbQuOiMNbuW/z0iB6lT9o5sDK161yyJySzlApWJYNKawDGunW0DseohhDM8adZiqmJk4IU1fUm+gxgfAp9tQLKolwodTn9+dUYjYADZbuY/y4i7r63+9KZJx5PU1qV8BLHT6JDoi0P8Efw69w2kW78S4ZMw4mohX9n2pKajZvoPpFRVw8/gGnPNuAlummcM6LK1GcT4u8evsf4fNGJKmuaTEk5u9cjvmUAHI75umW0oGxMLUHDeHuWGRfcgZkVT0W6ZtYoT93P//Ha1SqD6pxSs2sZiGSaU2tv4D3omMbJGULO91m4su+9Jq/hgw7tKHZGDSeR+3W/00WSDu0IUxmsrqdi0z0WwG4WWopmP+6DPMlS4TCvc2J8MAgWKrUZGQ2cdWLcsaLpWDFRZ0rtF7V93QzuZivovS1H1WQWrod+gt6DxOgLoIEM2OZ7YjXNXWm5cbm66Cjl6trnVBLiQIEippPcU/k9fGEs220/YUdNgKr2m4TKzx/HeCurCZuxO5v98mBcajpkEWSjS+etJBbUliP8SbiM728wDcsl6293G3r30exfadeetyiJYBRYt7Sv49eC0dCsZeu2QLLw5QMMYk2F7CsqlO3eZ8HHVlQmFTLPxW8N77f94VmxAQt4rauBY3/cBN73MGn3ebm3S2U3hizfrAxEuV3oMaRH3f32/i2cN7V2lwYT/DpVDrUvM/B3edAaLYr+4BMfph0+UbfJayj3Mhplwifd9e/0tqZ2JHc1tmesrBuwlc6I7U9+Q6dGHpvdnV5BhFikQqQLR6BFxI0hDay0rJip3h+hKMO86Ks1PAupWF7JBF/kAMzsevl9rAqNv4h/aqaHhaUxRuFfwqLQBKP44jHJa696UzGUH7CY6I5+T8kXZKQn0815kvqOtfAy5vAh4gcwO+MxbbpOEufopOCGYzBbKBOzR5EmrNHGe4tXDY6dZqJI9gPskQa28v14Mmbt+CsF2aRpd8spVzQkpxEOE0Q+S+HqH5HnrSiEhgqGtfyKExoapzlNcbP73SjTQJHiaw9Qtu5Hv8onn6UggLEdsQprzcOGjuXk5zQIM31zSOgw5s0iOvjCpbrMon2LMx0xt1Fq0iq9Lab5m8muRHjLotJcnoStLUeh2TO/XvYE5+G2lJqQTpbcsw9kMIGGj90Bn5qBrcz6eqeJ5CYin1unV+fH58LakWjOMtZ4WO4jL1Z6znP2PQADXsGZK9TE53LsF8K/OAf6QQaXLY41+z8r50Ot/K57hQ== X-MS-Exchange-CrossTenant-Network-Message-Id: 46ad0e6a-a411-48f8-af55-08da558bb4fd X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:46:15.2935 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zvqJTQOsngnUkWVJF5shMoUF187er3Ep3DAJL7hyoZ2LPrPe3oj98I1WjCnnPXWKOdrDJS2xLz9kMo5vcUnXkKLvU0BqnTgwk8cpJMjsd3U= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2789 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Previously the target routing specifics of switch decoders were factored out of 'struct cxl_decoder' into 'struct cxl_switch_decoder'. This patch, 2 of 3, adds a 'struct cxl_root_decoder' as a superset of a switch decoder that also track the associated CXL window platform resource. Note that the reason the resource for a given root decoder needs to be looked up after the fact (i.e. after cxl_parse_cfmws() and add_cxl_resource()) is because add_cxl_resource() may have merged CXL windows in order to keep them at the top of the resource tree / decode hierarchy. Co-developed-by: Ben Widawsky Signed-off-by: Ben Widawsky Signed-off-by: Dan Williams --- drivers/cxl/acpi.c | 40 ++++++++++++++++++++++++++++++++++++---- drivers/cxl/core/port.c | 43 +++++++++++++++++++++++++++++++++++++------ drivers/cxl/cxl.h | 15 +++++++++++++-- 3 files changed, 86 insertions(+), 12 deletions(-) diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c index 003fa4fde357..5972f380cdf2 100644 --- a/drivers/cxl/acpi.c +++ b/drivers/cxl/acpi.c @@ -82,7 +82,7 @@ static int cxl_parse_cfmws(union acpi_subtable_headers *header, void *arg, int target_map[CXL_DECODER_MAX_INTERLEAVE]; struct cxl_cfmws_context *ctx = arg; struct cxl_port *root_port = ctx->root_port; - struct cxl_switch_decoder *cxlsd; + struct cxl_root_decoder *cxlrd; struct device *dev = ctx->dev; struct acpi_cedt_cfmws *cfmws; struct resource *cxl_res; @@ -128,11 +128,11 @@ static int cxl_parse_cfmws(union acpi_subtable_headers *header, void *arg, if (rc) goto err_insert; - cxlsd = cxl_root_decoder_alloc(root_port, ways); - if (IS_ERR(cxld)) + cxlrd = cxl_root_decoder_alloc(root_port, ways); + if (IS_ERR(cxlrd)) return 0; - cxld = &cxlsd->cxld; + cxld = &cxlrd->cxlsd.cxld; cxld->flags = cfmws_to_decoder_flags(cfmws->restrictions); cxld->target_type = CXL_DECODER_EXPANDER; cxld->hpa_range = (struct range) { @@ -375,6 +375,32 @@ static int add_cxl_resources(struct resource *cxl) return 0; } +static int pair_cxl_resource(struct device *dev, void *data) +{ + struct resource *cxl_res = data; + struct resource *p; + + if (!is_root_decoder(dev)) + return 0; + + for (p = cxl_res->child; p; p = p->sibling) { + struct cxl_root_decoder *cxlrd = to_cxl_root_decoder(dev); + struct cxl_decoder *cxld = &cxlrd->cxlsd.cxld; + struct resource res = { + .start = cxld->hpa_range.start, + .end = cxld->hpa_range.end, + .flags = IORESOURCE_MEM, + }; + + if (resource_contains(p, &res)) { + cxlrd->res = (struct resource *)p->desc; + break; + } + } + + return 0; +} + static int cxl_acpi_probe(struct platform_device *pdev) { int rc; @@ -425,6 +451,12 @@ static int cxl_acpi_probe(struct platform_device *pdev) if (rc) return rc; + /* + * Populate the root decoders with their related iomem resource, + * if present + */ + device_for_each_child(&root_port->dev, cxl_res, pair_cxl_resource); + /* * Root level scanned with host-bridge as dports, now scan host-bridges * for their role as CXL uports to their CXL-capable PCIe Root Ports. diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index fd1cac13cd2e..abf3455c4eff 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -259,6 +259,23 @@ static void cxl_switch_decoder_release(struct device *dev) kfree(cxlsd); } +struct cxl_root_decoder *to_cxl_root_decoder(struct device *dev) +{ + if (dev_WARN_ONCE(dev, !is_root_decoder(dev), + "not a cxl_root_decoder device\n")) + return NULL; + return container_of(dev, struct cxl_root_decoder, cxlsd.cxld.dev); +} +EXPORT_SYMBOL_NS_GPL(to_cxl_root_decoder, CXL); + +static void cxl_root_decoder_release(struct device *dev) +{ + struct cxl_root_decoder *cxlrd = to_cxl_root_decoder(dev); + + __cxl_decoder_release(&cxlrd->cxlsd.cxld); + kfree(cxlrd); +} + static const struct device_type cxl_decoder_endpoint_type = { .name = "cxl_decoder_endpoint", .release = cxl_decoder_release, @@ -273,7 +290,7 @@ static const struct device_type cxl_decoder_switch_type = { static const struct device_type cxl_decoder_root_type = { .name = "cxl_decoder_root", - .release = cxl_switch_decoder_release, + .release = cxl_root_decoder_release, .groups = cxl_decoder_root_attribute_groups, }; @@ -1218,9 +1235,23 @@ static struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, if (nr_targets) { struct cxl_switch_decoder *cxlsd; + struct cxl_root_decoder *cxlrd; + + if (is_cxl_root(port)) { + alloc = kzalloc(struct_size(cxlrd, cxlsd.target, + nr_targets), + GFP_KERNEL); + cxlrd = alloc; + if (cxlrd) + cxlsd = &cxlrd->cxlsd; + else + cxlsd = NULL; + } else { + alloc = kzalloc(struct_size(cxlsd, target, nr_targets), + GFP_KERNEL); + cxlsd = alloc; + } - alloc = kzalloc(struct_size(cxlsd, target, nr_targets), GFP_KERNEL); - cxlsd = alloc; if (cxlsd) { cxlsd->nr_targets = nr_targets; seqlock_init(&cxlsd->target_lock); @@ -1279,8 +1310,8 @@ static struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, * firmware description of CXL resources into a CXL standard decode * topology. */ -struct cxl_switch_decoder *cxl_root_decoder_alloc(struct cxl_port *port, - unsigned int nr_targets) +struct cxl_root_decoder *cxl_root_decoder_alloc(struct cxl_port *port, + unsigned int nr_targets) { struct cxl_decoder *cxld; @@ -1290,7 +1321,7 @@ struct cxl_switch_decoder *cxl_root_decoder_alloc(struct cxl_port *port, cxld = cxl_decoder_alloc(port, nr_targets); if (IS_ERR(cxld)) return ERR_CAST(cxld); - return to_cxl_switch_decoder(&cxld->dev); + return to_cxl_root_decoder(&cxld->dev); } EXPORT_SYMBOL_NS_GPL(cxl_root_decoder_alloc, CXL); diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 7525b55b11bb..6dd1e4c57a67 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -253,6 +253,16 @@ struct cxl_switch_decoder { struct cxl_dport *target[]; }; +/** + * struct cxl_root_decoder - Static platform CXL address decoder + * @res: host / parent resource for region allocations + * @cxlsd: base cxl switch decoder + */ +struct cxl_root_decoder { + struct resource *res; + struct cxl_switch_decoder cxlsd; +}; + /** * enum cxl_nvdimm_brige_state - state machine for managing bus rescans * @CXL_NVB_NEW: Set at bridge create and after cxl_pmem_wq is destroyed @@ -368,10 +378,11 @@ struct cxl_dport *cxl_find_dport_by_dev(struct cxl_port *port, const struct device *dev); struct cxl_decoder *to_cxl_decoder(struct device *dev); +struct cxl_root_decoder *to_cxl_root_decoder(struct device *dev); bool is_root_decoder(struct device *dev); bool is_endpoint_decoder(struct device *dev); -struct cxl_switch_decoder *cxl_root_decoder_alloc(struct cxl_port *port, - unsigned int nr_targets); +struct cxl_root_decoder *cxl_root_decoder_alloc(struct cxl_port *port, + unsigned int nr_targets); struct cxl_switch_decoder *cxl_switch_decoder_alloc(struct cxl_port *port, unsigned int nr_targets); int cxl_decoder_add(struct cxl_decoder *cxld, int *target_map); From patchwork Fri Jun 24 02:46:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893327 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8A9BCCA481 for ; Fri, 24 Jun 2022 02:46:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229889AbiFXCqa (ORCPT ); Thu, 23 Jun 2022 22:46:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229811AbiFXCqa (ORCPT ); Thu, 23 Jun 2022 22:46:30 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CAFA56C3A; Thu, 23 Jun 2022 19:46:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038788; x=1687574788; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=OTdvADAgli1BCcsI3SQRCJAy3T6RLfLrSgdDO7VGMaY=; b=Nu2Q0CJUmorQesFsCxbbOBB68xfucfVwIHgiy0RMhFPUgI1r2J2gZjcw GpnnhQjCHO6gfyavr/2XdxBOPxG1uPrPejyf8m3N14yU/oapnMGLT11Tf rOfYId7oEYpzPUZhSxA/s9vliwAasXrIrsLDozbiR5VICjhd4VGI9MiqP zr7/m5CpiFroxkVDttcqItr7QcJM1bp06ix5Xq8ijdR/4gjnzGpu2Oi7c VMNB/eok2UQMlEvF+yecYOMaQBSfEUDZB1iWUBy2DpA32xE1Ct5vDtWWh U49aJaUeqQTs6DvS3w9WoLaHfuE2EZOo4K7M/gFSH7pJwwDneDGr4x2u0 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="344898318" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="344898318" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:46:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="915490375" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by fmsmga005.fm.intel.com with ESMTP; 23 Jun 2022 19:46:27 -0700 Received: from fmsmsx606.amr.corp.intel.com (10.18.126.86) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:46:26 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:46:26 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.47) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:46:26 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fZxMgGHPpZ9iUn2hgOde8fD11H4kYqSwOCOIuRGjThycsI8doBDBgVzbQ3A4hT7Dfwnl/fmlLlcV5C68c5MuXOLEtdAGmPPyTBXRQ0SXaLqQaGiz2xK4Je89kMaTZ4WP8EXFHfQw6JX/+nUZvNuxhvvsEagouq5d+603pc4jf2qFeb9i0wuNSPp7NX29k+l2XQiC9uaStpuDGCHsIgugcbCscS/DarONzElatGajJVaEcFP/41hnYKWq4zDdG0mqKgfgb1K4CQOUEvHa/Belg80MOtHqRErOX/oT1wkeKv3clo4ZBtcqV7Qnr5cM7ozfodMdqBwxzmn24V/59OyUxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tC2Qoi7N3OOEJoSaxNFM90Jbrcnlkd7sm8X/nMPSbLw=; b=fC9ZlAgqLDSVLI7rZ57gCzyqz8uYSUAW8manme6ixDkiJ7B/RI+ZdxDslT8wyiCutV4WsWrDufoPEQ6fou9YfvdGVpJZvumwYRLZnYlYXK5O67hgr/MqBeLLUiIcnNveLct7hlPAPWPAVNFoFireO3IAx3B1uXzCeJrnVzn6xZljs7tTL43JPYmePg25lBOG2v8wqh07yWbtxdQjOaDyrvJGf83pBgCJLHTPudF+1Bc92w3PZMTyjpn9RIb019UtxE2LnqgTvcJOuSs7cBq+/0d+R8TmcrXX4UAuuKzfkTdKdq/9nAaSmuHuheEN6rH/eDsZbHGVoW0oBzuycKxBuA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BYAPR11MB2789.namprd11.prod.outlook.com (2603:10b6:a02:cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Fri, 24 Jun 2022 02:46:24 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:46:24 +0000 Date: Thu, 23 Jun 2022 19:46:21 -0700 From: Dan Williams To: CC: Ben Widawsky , , , , , Subject: [PATCH 11/46] cxl/core: Define a 'struct cxl_endpoint_decoder' for tracking DPA resources Message-ID: <165603878173.551046.17541236959392713646.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MWHPR18CA0062.namprd18.prod.outlook.com (2603:10b6:300:39::24) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e9265494-8d81-4049-15cd-08da558bba37 X-MS-TrafficTypeDiagnostic: BYAPR11MB2789:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6bJjrOxghHesbI9slF8GIQrdKKIk3zyuMwd6/d3w8n6sleGMgp44OKGUzhgbvcIcZbESlP+OdgRR79wmNaULFlnG7M1IHDR+v6W4FCcYv+twUQnA//fSo5Hqqos4LxnuLAgOBMWmB60qyktkNUCNhL01m3/Y81O4vjOTEJNICfzKI3U0pO5Ngh1IJ845y5CZd+KOkUblYpakkm57ahCS1B7suzasF0BxIt4pwfG5t3PMYPsIrxHbhCg728UGZI5sPwL3t0Vnlo2Xof37AkN6K1SCMJ54fXTBXgypuSWQs8Lw44xmCTlVbkzAONBPMKK/WbiGLMuv8X9Kls3RNI/lUJrT1gZ3NYfslPzSoyJyG0aGsXAK3TPplluvudBnUHo6Fg/2zRctBVa1P+dI+DHcOFyQQDV6oIfgyXkYl7eYb1re8VBDjpTGeG+u5bgAeTw0SH+qpetiTVPsF5ZL7cJ8f+YxKKLet0MK/MSfGS9iYlhp8Rn9AK6V/YTKJzt8EQVf2S5sqgszmrHdR644O/0RAu5dGcRgqyxsGsO5geo/80BdQOGCN0BaHPlawSGh1lyWpKksWVjS5jaupXChHq/5OFFKu3ozNCYL6dUBW1kmRLNBpFiZqu+5Lf+936hrk2dnldhulFo7NvxLsBq01wuqDeP3BYEqFsn7bGc2PzqBG+/i3FBR6vW/uc/yUoZJNJG7eX6wDu+uAoGDKs/ZKPFpnJ2Fmvrn8dRP/wIdUN1CCi/6WlHQUl+JgHk4HCImbCsc X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(366004)(136003)(39860400002)(396003)(376002)(346002)(8676002)(6506007)(66476007)(66556008)(6666004)(9686003)(82960400001)(33716001)(4326008)(38100700002)(6512007)(66946007)(41300700001)(478600001)(316002)(83380400001)(8936002)(86362001)(103116003)(186003)(2906002)(6916009)(6486002)(26005)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cmTvVb+KrI1nBHCfBScfwDFihqcaRM4tKVpzPnTTs1WiqWN2vH73ccHGFK9JhauDMAnkP1jwyapd3Da+qOXEHXr9MnVrAmp2Lipho+2i8zV1CEMpCgEGxxZLUzwdBaidJJfxAhUjGRnHRkBcRxiN2FaOjDqlg+gA0MjSxh8Yf8/elrz+UmBGJ6dOdNYACDhgECBFuOOSh58lHxO6cqYdhkicwjO+6pTHnIqNCcZ00pToF/hD/4Ma0gpSZfnmnzVXEu+A6ox5p5gFswGkQ4N88oieZvb0aZ+kY7vX9fPNiT0y4hgWZKoqZyU4b9NOMNJnJoad+noCDfeOSvbmJv724Jo9gohQa2Epm/dPZ1TKPDVyglTneCUDEO9eFJEYLzsj/lbMx/MJhwguGz9OR/9mVaCs3GYvIWlAb/kOw4aVVg9CqW3Qhns46JsWFEcYtJ7BgxVOnwsx6Nht21Lml8/mBQ5wS2vlzF1fIvzzyoUyxwnu5b0rwozzplLiujFcEhzjoKg+QN/PXf2XGQK8Wz9PBzeKsP748Hnk9n3yFyzdfL1NpKMM6w/w+Vuyt/GaNXHl5KoljWxHi0djEo7eCPr0Vc58nUgYlxR8tXeSwWdOsbegdOVGRZ+2/UMvBT7at0pt7JEN19pR/H/lH5Dgo0BJYCvfulmBVXh14ImQs8VQ0Ymzip5rd7JTMMvH2GOgLZV+P5lejLuLf/+Qmtn6GrZxGc8orfduufrZEMHwx2Cvz7IHpFj6IVtRzllfjL2ixk2vo1foEM5tjBlU9TPfyxu1vKhaAmnWjviFq1BQy77niIEQoEHRTgaC4JRqyfE+d0itrJKyLjvayLqzM8Sb20687mQ1V6lF1oyK+LzfItd4aZehzSrmbGbal5ts6w7aAhRuAnEtQFjdZTd3KFgrilL61GnitUhSFwssKBIalxqP1oV87Rl6EeH7XMYzsq4nsI4+O4PxCNF+BmiE6WuSdoy/K6HI7jvFmEb2154sJ9hSmDv99iuVaJLAzdEnfic9APD5vjHiBN+MPxgW1VFtySXoaHEsf6ppjgoo/pwg1RrFegQulnaF6PPLmI8hFWsaRSoPhpYcOW/TtYu8mrypSBSyvlJurlDRYLKX5519q5XWSzWyVLksn6GUsv1JCOq7HrEP25N6iknLB6um08i2ufqmZCGRxab6Kry2YTrXp4RTVwYUzalwvIK+KERb61e2IS0buQXlTK4CZRe6Uyi8mX3BeP7++GHgBM8kIIQ03qcUZ3H5CEgtl/Oba6/EQu3S6mWwzwxU4Gc1+MGM+5A4tvMvX/tLhZINf+unJuidMWmnoLMFngPvDY1gFL2P4XGjHtctjv+iB7duZwtKNCdYrImESC1k3Esijm6qDjtOmNLueIXOeVPDqb5POwzkVMNgjiuQQh8fWlhh+p1XqWzfemRlu0XLSYL56twnVQ4HPxy1qQWaw/06hdgpcRS2KWFoTDm7IFUVTq8HZk1R8tCUulxfnK0PB3LItM5w7xirKnca7T4ge5eyLAFWkaqBQhmPC5pa4Z2f6lldkWmy6v5HKazRmxJQuV+sgZ3N27rlloYwJOPCnYXTJgIYytZB0cdz4LnriSVcC50iLuj5TyoF+aE8vg== X-MS-Exchange-CrossTenant-Network-Message-Id: e9265494-8d81-4049-15cd-08da558bba37 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:46:24.0896 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: T2ZoQcP0ysFFuId82FvRt2D8JCJMvk5s0jbbb6tF5wO6e6pwTlT57+AXcQaz9tR2nc6LrADCg5Eyfh3YCVzHX6AjuNDCwm419s4bcEUeY1E= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2789 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Previously the target routing specifics of switch decoders and platfom CXL window resource tracking of root decoders were factored out of 'struct cxl_decoder'. While switch decoders translate from SPA to downstream ports, endpoint decoders translate from SPA to DPA. This patch, 3 of 3, adds a 'struct cxl_endpoint_decoder' that tracks an endpoint-specific Device Physical Address (DPA) resource. For now this just defines ->dpa_res, a follow-on patch will handle requesting DPA resource ranges from a device-DPA resource tree. Co-developed-by: Ben Widawsky Signed-off-by: Ben Widawsky Signed-off-by: Dan Williams --- drivers/cxl/core/hdm.c | 12 +++++++++--- drivers/cxl/core/port.c | 36 +++++++++++++++++++++++++++--------- drivers/cxl/cxl.h | 15 ++++++++++++++- tools/testing/cxl/test/cxl.c | 11 +++++++++-- 4 files changed, 59 insertions(+), 15 deletions(-) diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index 2d1f3e6eebea..2223d151b61b 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -224,9 +224,15 @@ int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) int rc, target_count = cxlhdm->target_count; struct cxl_decoder *cxld; - if (is_cxl_endpoint(port)) - cxld = cxl_endpoint_decoder_alloc(port); - else { + if (is_cxl_endpoint(port)) { + struct cxl_endpoint_decoder *cxled; + + cxled = cxl_endpoint_decoder_alloc(port); + if (IS_ERR(cxled)) + cxld = ERR_CAST(cxled); + else + cxld = &cxled->cxld; + } else { struct cxl_switch_decoder *cxlsd; cxlsd = cxl_switch_decoder_alloc(port, target_count); diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index abf3455c4eff..b5f5fb9aa4b7 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -243,12 +243,12 @@ static void __cxl_decoder_release(struct cxl_decoder *cxld) put_device(&port->dev); } -static void cxl_decoder_release(struct device *dev) +static void cxl_endpoint_decoder_release(struct device *dev) { - struct cxl_decoder *cxld = to_cxl_decoder(dev); + struct cxl_endpoint_decoder *cxled = to_cxl_endpoint_decoder(dev); - __cxl_decoder_release(cxld); - kfree(cxld); + __cxl_decoder_release(&cxled->cxld); + kfree(cxled); } static void cxl_switch_decoder_release(struct device *dev) @@ -278,7 +278,7 @@ static void cxl_root_decoder_release(struct device *dev) static const struct device_type cxl_decoder_endpoint_type = { .name = "cxl_decoder_endpoint", - .release = cxl_decoder_release, + .release = cxl_endpoint_decoder_release, .groups = cxl_decoder_endpoint_attribute_groups, }; @@ -320,6 +320,15 @@ struct cxl_decoder *to_cxl_decoder(struct device *dev) } EXPORT_SYMBOL_NS_GPL(to_cxl_decoder, CXL); +struct cxl_endpoint_decoder *to_cxl_endpoint_decoder(struct device *dev) +{ + if (dev_WARN_ONCE(dev, !is_endpoint_decoder(dev), + "not a cxl_endpoint_decoder device\n")) + return NULL; + return container_of(dev, struct cxl_endpoint_decoder, cxld.dev); +} +EXPORT_SYMBOL_NS_GPL(to_cxl_endpoint_decoder, CXL); + static struct cxl_switch_decoder *to_cxl_switch_decoder(struct device *dev) { if (dev_WARN_ONCE(dev, !is_switch_decoder(dev), @@ -1258,8 +1267,12 @@ static struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, cxld = &cxlsd->cxld; } } else { - alloc = kzalloc(sizeof(*cxld), GFP_KERNEL); - cxld = alloc; + struct cxl_endpoint_decoder *cxled; + + alloc = kzalloc(sizeof(*cxled), GFP_KERNEL); + cxled = alloc; + if (cxled) + cxld = &cxled->cxld; } if (!alloc) return ERR_PTR(-ENOMEM); @@ -1357,12 +1370,17 @@ EXPORT_SYMBOL_NS_GPL(cxl_switch_decoder_alloc, CXL); * * Return: A new cxl decoder to be registered by cxl_decoder_add() */ -struct cxl_decoder *cxl_endpoint_decoder_alloc(struct cxl_port *port) +struct cxl_endpoint_decoder *cxl_endpoint_decoder_alloc(struct cxl_port *port) { + struct cxl_decoder *cxld; + if (!is_cxl_endpoint(port)) return ERR_PTR(-EINVAL); - return cxl_decoder_alloc(port, 0); + cxld = cxl_decoder_alloc(port, 0); + if (IS_ERR(cxld)) + return ERR_CAST(cxld); + return to_cxl_endpoint_decoder(&cxld->dev); } EXPORT_SYMBOL_NS_GPL(cxl_endpoint_decoder_alloc, CXL); diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 6dd1e4c57a67..579f2d802396 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -239,6 +239,18 @@ struct cxl_decoder { unsigned long flags; }; +/** + * struct cxl_endpoint_decoder - Endpoint / SPA to DPA decoder + * @cxld: base cxl_decoder_object + * @dpa_res: actively claimed DPA span of this decoder + * @skip: offset into @dpa_res where @cxld.hpa_range maps + */ +struct cxl_endpoint_decoder { + struct cxl_decoder cxld; + struct resource *dpa_res; + resource_size_t skip; +}; + /** * struct cxl_switch_decoder - Switch specific CXL HDM Decoder * @cxld: base cxl_decoder object @@ -379,6 +391,7 @@ struct cxl_dport *cxl_find_dport_by_dev(struct cxl_port *port, struct cxl_decoder *to_cxl_decoder(struct device *dev); struct cxl_root_decoder *to_cxl_root_decoder(struct device *dev); +struct cxl_endpoint_decoder *to_cxl_endpoint_decoder(struct device *dev); bool is_root_decoder(struct device *dev); bool is_endpoint_decoder(struct device *dev); struct cxl_root_decoder *cxl_root_decoder_alloc(struct cxl_port *port, @@ -386,7 +399,7 @@ struct cxl_root_decoder *cxl_root_decoder_alloc(struct cxl_port *port, struct cxl_switch_decoder *cxl_switch_decoder_alloc(struct cxl_port *port, unsigned int nr_targets); int cxl_decoder_add(struct cxl_decoder *cxld, int *target_map); -struct cxl_decoder *cxl_endpoint_decoder_alloc(struct cxl_port *port); +struct cxl_endpoint_decoder *cxl_endpoint_decoder_alloc(struct cxl_port *port); int cxl_decoder_add_locked(struct cxl_decoder *cxld, int *target_map); int cxl_decoder_autoremove(struct device *host, struct cxl_decoder *cxld); int cxl_endpoint_autoremove(struct cxl_memdev *cxlmd, struct cxl_port *endpoint); diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c index 68288354b419..f52a5dd69d36 100644 --- a/tools/testing/cxl/test/cxl.c +++ b/tools/testing/cxl/test/cxl.c @@ -459,8 +459,15 @@ static int mock_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) cxld = ERR_CAST(cxlsd); else cxld = &cxlsd->cxld; - } else - cxld = cxl_endpoint_decoder_alloc(port); + } else { + struct cxl_endpoint_decoder *cxled; + + cxled = cxl_endpoint_decoder_alloc(port); + if (IS_ERR(cxled)) + cxld = ERR_CAST(cxled); + else + cxld = &cxled->cxld; + } if (IS_ERR(cxld)) { dev_warn(&port->dev, "Failed to allocate the decoder\n"); From patchwork Fri Jun 24 02:46:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893328 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A996AC433EF for ; Fri, 24 Jun 2022 02:46:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229691AbiFXCqj (ORCPT ); Thu, 23 Jun 2022 22:46:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229572AbiFXCqi (ORCPT ); Thu, 23 Jun 2022 22:46:38 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92A5F56C31; Thu, 23 Jun 2022 19:46:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038797; x=1687574797; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=Wmpgh9AjslF4pd11mVcRUXyrDguxp+Op1Ge0VFiVGOY=; b=Sn8yERhcXjSp7rsJQ0MeeknjEGO+om6G+vJqPMTXTACP4AeBVHo57Brm 78SwAi67bjovlC3nlrOuQcItCP0eHIs8oIg1eFbHwRYlCHJ/cPnD8GIih 4FF/JprXBCemVYLGHh3vYBA5+7KcCmVS5DofCP5ekjBlOUOk+jL4dDXuo JJJ0K+bBazbnqSOakM0lYLc8kwe/ngR34UT1CtKI3ARGS6M7lj5JapiUh vbK8HE9EIm0xPSEVF5MqaLT5rQRMSTvtvthTLdsGIfR5nxPxEpMgTYrxk 7RCQEbtsX3wjMa36znz+SDsohGv2HClTcaMmz2KU6aBrN0lhYieO4d3Yy Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="280949085" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="280949085" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:46:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="834933791" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga006.fm.intel.com with ESMTP; 23 Jun 2022 19:46:37 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:46:36 -0700 Received: from fmsmsx606.amr.corp.intel.com (10.18.126.86) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:46:36 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:46:36 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.43) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:46:36 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X1zfGRfJ4xf1gNtcXlg0B3sAh1Aj8lyRynXwvYrvT+O7QldpRaKuyFYkp5Kx698W5p3//VqEMYqHZTVvQagsnuaM89RRflMMUtlQ1oCPiTHqNKTgW+DbQxgef57WSbD6lzxPxnCKErzhc5O2mq5jRX/bVEZv1kEM20GgmnzrgnefMlUte3DE/bvYxzoUsjWC6QQJ0KOdTONwezTHCTPwekPBkxZuLb4kmzaRC3s7TYE+BeU6WO6gURhi/4KUaToKggnJmBQX7G+iT8xZcOluU9E1orIBb0v3oNaf6WIa7Y6oruONZLVeSr8QyuYeInEAzfyX+6kb1676kq0rSgkfUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TefVamjuFD+YmQWUv1V187FHCP7otPSnYBTXRSz0K7E=; b=Eadd/g4WjRmHxJJgoiqEoTV0/btak/hy9bSvtOID2PARXYewN29A7uSGsEVPguJWw8CcS1Cp656BxYXX3OsLOFK9TVoGiOVegy7f+gMIxFZekjZrYg+6K7I/DrAQi+SiFE4uZtrICTstUC8FjyaxrRzRROcTnBwb3bFQ8R9suYAGQv8L32mW5A+FXrd+ahOmMDXSDrtbH+GkyEU9NZXez20UPPt0EvZFSVQl6pGXv5bW/DyscOiets5YgGcoVWyqlkMP5MFkL1hKB9qxyMjE2Ej8DXoqlw/i0nGl/WRjMCnXI6b5TQrnD9RSSz7BEGnoEid8RlNd1sOMfTCh8CKWXQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BYAPR11MB2789.namprd11.prod.outlook.com (2603:10b6:a02:cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Fri, 24 Jun 2022 02:46:34 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:46:34 +0000 Date: Thu, 23 Jun 2022 19:46:29 -0700 From: Dan Williams To: CC: Ira Weiny , , , , , Subject: [PATCH 12/46] cxl/mem: Convert partition-info to resources Message-ID: <165603878921.551046.8127845916514734142.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: CO2PR04CA0199.namprd04.prod.outlook.com (2603:10b6:104:5::29) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ba54061f-29a9-4926-8ff7-08da558bbe59 X-MS-TrafficTypeDiagnostic: BYAPR11MB2789:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lt9AqI/Kpn+1ngzWQTBFvRUeczlk6nvttsxUSphuhX6L1GSH8iGOc2HrkDYOUAryXutzyKbF/y/ojaKLgCCzw2GfI/WK3iog+plege4BP8JnJBCbszh4q4ftjairqFsxKooATi8Jca7DAY3zFSWi4F2k5lvAGeYuBD6Dz7XRW8gnFD5DNeQRTIE7e/eIyAXU+y21TL71bQNEkp530T42FBZmSF/vAChrnJLbgVmkDgfZXvX9FKgLA0cpP4iBcD5mwpKHTZQFr+DbZm9Bl2HDlG5F5VBUMXpV/MUGqviw2lUNYJa9G+KyuU+nPLXwfZpzZr94ZM6NrozJcs8Z/YVvJz2eJ6jhg7lfjUXVg2KpcqEhtaugLfwsk3151osCwYNGKudN4nURu9QLajbO4MgtOf731e/tpNFUWnHIQ0soiNtmYCzgP8KXDKFktaGQTvk4RODZXQtwhVcCIEurqPQiE2jn2Ai/+zuCm8XIUIyKwUnFaWtLEMB0spJkIGRnLWzfHz6AEspoMDYAXuK4u0yVyueBq9GE2MLn69wyHBQFtcU5N65mh1Hbt5ICOhN8X7kDc4Cnbdwxdx0uHIXfLA/n5rjJly3ScJIQbd17g9hYIAprmGE6FAQhPALxgglJTMPaYDzi7BM0rHnpwakm73Z8qQPu7E8kA4z2++hAVdvjcJJHW5oufCBIa3ofTVf9tweVbvDIXHdzo8BaHTRbFt59uEJ1iTHMYgzWsRLhJQr0PLjFp8/idUQtdCH56lpQHO4X X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(366004)(136003)(39860400002)(396003)(376002)(346002)(8676002)(6506007)(66476007)(66556008)(6666004)(9686003)(82960400001)(33716001)(4326008)(38100700002)(6512007)(66946007)(41300700001)(478600001)(316002)(83380400001)(8936002)(86362001)(103116003)(186003)(2906002)(6916009)(6486002)(26005)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: S8Nw7tAu+exrNLwVf11gcgHufUUk/Y40TOU5hir5BqDot5JCvEYMmpu57a7r80ZSrPX/eLjAMNeb9FvSS0xwckPZ8UHt9j7AqhZlX7DU1jTVMcI9Z4iPuv+5alqot2pFHTshFW6Utkamm308JR4OMvK91cJWTATplBTytNzYT17mEkRdMTEXYNAWnNmKsGh5DIBcN6KFiwP3oq8eY7j7aHbnXBy9WyJp8ulyFf0mVvsmD2asn9ZNdmikFhNRRNx5VMDa0/chIRA0jRprmQvEio1uLvrtdhicQGaW4zp8sWGWppjaTie7iamH54fZpXAgu9bC80P1IkTwIwgDbAn9n0DyL+QunAPxp/0bWbE2wEHtxTKZn8lFgAe/KG3X07NEnk5s4UyW0aAeaZIyhwOqw+2YfvIWCOhaq5Vf5Q1MKU/cbUGoa21ngIEKWh9nPOySHcXFAKqKK0NZw052Sg9sfPQ8/sflQR52TOsks/EM26Eyvf2Dex8P37SAU/WAtH1tuWgzN55gmNeq58YNh0ZK25j3YV9E8i+eKblDcoNvzDV8JARw+xmBbH6PWiWVqu15fM0WvJnCjYLdjRDe9HgtktRVYDZ+stapO6G/+LC/7IfokY/z5F0lKzerlVq841ojHZUP3J9NTe0/GKs/BfZy32GEb18gAlTAcbpGXUYFkaIosd75/JvucBmQSK1yBHXH0qfaILE0Gg9x3elaVR5ttLnHLRXBZ75WzYQ3r3+xjG8lBVvtNvapn9AELa/15mWMP50jkWR12I002/iNUbjM9LzyXA6SSvThrZjoiqohzv61pZcAP9kGWU/rZpBjKdDZMRsSnkUYhswF5JmBmvixj6iQMUytWeKxhvnnu822mHt63PjZF1gDxEEUVX0Z43nTGk6G3VYkM09scA/WL97DM8WmlsCS7FQauCfv8XBNuiNAyRylwkUI3dsde4JV1qjfEpUKSVdW5qFCPBRLGRW0A6+hr6PvIs0CJiE2oiS6DGlQrF/2x8uWZiH2Ry8RkjlZ4J62JpDJIF2/kBbJAOUg4EtDyQjNQMBHTM9Hyx63Ut2mbJy3wO3v/i6yb0CWi0yF14MYg6pzvdJNzRmanIZjsquJ4i3DlAQ5vAFkF5CzQTH6x0qT2h+zvtGpOnsiTRMYgNEwg+9GmQQ+JMhlOrTCRZM7UVlBlNg799cUL28OrY+7irxwWHh3VnfRXcBfAJaQQiMzuhgSH7LNK6l4duN6kYd079BsEJRhu/ASqx8SJEG2NoWpV14YDV0nWfcanJW0tDoK/6WkGl7mhgDdoZc6Mf1x7tu8XECV62YaksZN5ei//4EeHZ0XnewsWwYJkJfgoMt6sk8VcbgNWlCzwVkI28vtJxab+Rlxrg/zPzxsk9fsrTnrmN+/NkBwwuW2omi6uoSJ2Nfg+rIGuDuCyNw+5jm6BmSZdFl33znI1quOeBiO2BKRkPG294/v8BVAB8hOt5pbA8mxLBaSEwGfiM9aHfwcnUtDJDgKH02trAt9ltbIYM2YdjrmgdSdhksGmQ5WttqaOcWrtFcZ0Eas1EYHGO3CeH+1Mn5E3mtBRwz6sZHuPgKZCO4QDqv3iDpHdMx1K1HcpFQX7NL1S6hrZhGfQg== X-MS-Exchange-CrossTenant-Network-Message-Id: ba54061f-29a9-4926-8ff7-08da558bbe59 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:46:30.9952 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: oa/hAsqkuihuJudal/n1zQ7WP1qRlWj3obCoOGK4bVOV7Fbosw0ERnjkxeYuFqMrg6+w+YF4IS5JS2yhJUmGGfY9ShJYnuZB92rsjRmx1aA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2789 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org To date the per-device-partition DPA range information has only been used for enumeration purposes. In preparation for allocating regions from available DPA capacity, convert those ranges into DPA-type resource trees. With resources and the new add_dpa_res() helper some open coded end address calculations and debug prints can be cleaned. The 'cxlds->pmem_res' and 'cxlds->ram_res' resources are child resources of the total-device DPA space and they in turn will host DPA allocations from cxl_endpoint_decoder instances (tracked by cxled->dpa_res). Cc: Ira Weiny Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- drivers/cxl/core/mbox.c | 78 ++++++++++++++++++++++++------------------ drivers/cxl/core/memdev.c | 4 +- drivers/cxl/cxlmem.h | 10 +++-- drivers/cxl/pci.c | 2 + tools/testing/cxl/test/mem.c | 2 + 5 files changed, 55 insertions(+), 41 deletions(-) diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c index 54f434733b56..3fe113dd21ad 100644 --- a/drivers/cxl/core/mbox.c +++ b/drivers/cxl/core/mbox.c @@ -771,15 +771,6 @@ int cxl_dev_state_identify(struct cxl_dev_state *cxlds) cxlds->partition_align_bytes = le64_to_cpu(id.partition_align) * CXL_CAPACITY_MULTIPLIER; - dev_dbg(cxlds->dev, - "Identify Memory Device\n" - " total_bytes = %#llx\n" - " volatile_only_bytes = %#llx\n" - " persistent_only_bytes = %#llx\n" - " partition_align_bytes = %#llx\n", - cxlds->total_bytes, cxlds->volatile_only_bytes, - cxlds->persistent_only_bytes, cxlds->partition_align_bytes); - cxlds->lsa_size = le32_to_cpu(id.lsa_size); memcpy(cxlds->firmware_version, id.fw_revision, sizeof(id.fw_revision)); @@ -787,42 +778,63 @@ int cxl_dev_state_identify(struct cxl_dev_state *cxlds) } EXPORT_SYMBOL_NS_GPL(cxl_dev_state_identify, CXL); -int cxl_mem_create_range_info(struct cxl_dev_state *cxlds) +static int add_dpa_res(struct device *dev, struct resource *parent, + struct resource *res, resource_size_t start, + resource_size_t size, const char *type) { int rc; - if (cxlds->partition_align_bytes == 0) { - cxlds->ram_range.start = 0; - cxlds->ram_range.end = cxlds->volatile_only_bytes - 1; - cxlds->pmem_range.start = cxlds->volatile_only_bytes; - cxlds->pmem_range.end = cxlds->volatile_only_bytes + - cxlds->persistent_only_bytes - 1; + res->name = type; + res->start = start; + res->end = start + size - 1; + res->flags = IORESOURCE_MEM; + if (resource_size(res) == 0) { + dev_dbg(dev, "DPA(%s): no capacity\n", res->name); return 0; } - - rc = cxl_mem_get_partition_info(cxlds); + rc = request_resource(parent, res); if (rc) { - dev_err(cxlds->dev, "Failed to query partition information\n"); + dev_err(dev, "DPA(%s): failed to track %pr (%d)\n", res->name, + res, rc); return rc; } - dev_dbg(cxlds->dev, - "Get Partition Info\n" - " active_volatile_bytes = %#llx\n" - " active_persistent_bytes = %#llx\n" - " next_volatile_bytes = %#llx\n" - " next_persistent_bytes = %#llx\n", - cxlds->active_volatile_bytes, cxlds->active_persistent_bytes, - cxlds->next_volatile_bytes, cxlds->next_persistent_bytes); + dev_dbg(dev, "DPA(%s): %pr\n", res->name, res); - cxlds->ram_range.start = 0; - cxlds->ram_range.end = cxlds->active_volatile_bytes - 1; + return 0; +} - cxlds->pmem_range.start = cxlds->active_volatile_bytes; - cxlds->pmem_range.end = - cxlds->active_volatile_bytes + cxlds->active_persistent_bytes - 1; +int cxl_mem_create_range_info(struct cxl_dev_state *cxlds) +{ + struct device *dev = cxlds->dev; + int rc; - return 0; + cxlds->dpa_res = + (struct resource)DEFINE_RES_MEM(0, cxlds->total_bytes); + + if (cxlds->partition_align_bytes == 0) { + rc = add_dpa_res(dev, &cxlds->dpa_res, &cxlds->ram_res, 0, + cxlds->volatile_only_bytes, "ram"); + if (rc) + return rc; + return add_dpa_res(dev, &cxlds->dpa_res, &cxlds->pmem_res, + cxlds->volatile_only_bytes, + cxlds->persistent_only_bytes, "pmem"); + } + + rc = cxl_mem_get_partition_info(cxlds); + if (rc) { + dev_err(dev, "Failed to query partition information\n"); + return rc; + } + + rc = add_dpa_res(dev, &cxlds->dpa_res, &cxlds->ram_res, 0, + cxlds->active_volatile_bytes, "ram"); + if (rc) + return rc; + return add_dpa_res(dev, &cxlds->dpa_res, &cxlds->pmem_res, + cxlds->active_volatile_bytes, + cxlds->active_persistent_bytes, "pmem"); } EXPORT_SYMBOL_NS_GPL(cxl_mem_create_range_info, CXL); diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c index f7cdcd33504a..20ce488a7754 100644 --- a/drivers/cxl/core/memdev.c +++ b/drivers/cxl/core/memdev.c @@ -68,7 +68,7 @@ static ssize_t ram_size_show(struct device *dev, struct device_attribute *attr, { struct cxl_memdev *cxlmd = to_cxl_memdev(dev); struct cxl_dev_state *cxlds = cxlmd->cxlds; - unsigned long long len = range_len(&cxlds->ram_range); + unsigned long long len = resource_size(&cxlds->ram_res); return sysfs_emit(buf, "%#llx\n", len); } @@ -81,7 +81,7 @@ static ssize_t pmem_size_show(struct device *dev, struct device_attribute *attr, { struct cxl_memdev *cxlmd = to_cxl_memdev(dev); struct cxl_dev_state *cxlds = cxlmd->cxlds; - unsigned long long len = range_len(&cxlds->pmem_range); + unsigned long long len = resource_size(&cxlds->pmem_res); return sysfs_emit(buf, "%#llx\n", len); } diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h index 7df0b053373a..a9609d40643f 100644 --- a/drivers/cxl/cxlmem.h +++ b/drivers/cxl/cxlmem.h @@ -178,8 +178,9 @@ struct cxl_endpoint_dvsec_info { * @firmware_version: Firmware version for the memory device. * @enabled_cmds: Hardware commands found enabled in CEL. * @exclusive_cmds: Commands that are kernel-internal only - * @pmem_range: Active Persistent memory capacity configuration - * @ram_range: Active Volatile memory capacity configuration + * @dpa_res: Overall DPA resource tree for the device + * @pmem_res: Active Persistent memory capacity configuration + * @ram_res: Active Volatile memory capacity configuration * @total_bytes: sum of all possible capacities * @volatile_only_bytes: hard volatile capacity * @persistent_only_bytes: hard persistent capacity @@ -209,8 +210,9 @@ struct cxl_dev_state { DECLARE_BITMAP(enabled_cmds, CXL_MEM_COMMAND_ID_MAX); DECLARE_BITMAP(exclusive_cmds, CXL_MEM_COMMAND_ID_MAX); - struct range pmem_range; - struct range ram_range; + struct resource dpa_res; + struct resource pmem_res; + struct resource ram_res; u64 total_bytes; u64 volatile_only_bytes; u64 persistent_only_bytes; diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c index 5a0ae46d4989..eeff9599acda 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -454,7 +454,7 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (IS_ERR(cxlmd)) return PTR_ERR(cxlmd); - if (range_len(&cxlds->pmem_range) && IS_ENABLED(CONFIG_CXL_PMEM)) + if (resource_size(&cxlds->pmem_res) && IS_ENABLED(CONFIG_CXL_PMEM)) rc = devm_cxl_add_nvdimm(&pdev->dev, cxlmd); return rc; diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c index 6b9239b2afd4..b81c90715fe8 100644 --- a/tools/testing/cxl/test/mem.c +++ b/tools/testing/cxl/test/mem.c @@ -282,7 +282,7 @@ static int cxl_mock_mem_probe(struct platform_device *pdev) if (IS_ERR(cxlmd)) return PTR_ERR(cxlmd); - if (range_len(&cxlds->pmem_range) && IS_ENABLED(CONFIG_CXL_PMEM)) + if (resource_size(&cxlds->pmem_res) && IS_ENABLED(CONFIG_CXL_PMEM)) rc = devm_cxl_add_nvdimm(dev, cxlmd); return 0; From patchwork Fri Jun 24 02:46:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893329 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 925BCC43334 for ; Fri, 24 Jun 2022 02:46:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229572AbiFXCqt (ORCPT ); Thu, 23 Jun 2022 22:46:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229545AbiFXCqt (ORCPT ); Thu, 23 Jun 2022 22:46:49 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9866A56F81; Thu, 23 Jun 2022 19:46:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038808; x=1687574808; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=31yi+nv/vyhzD60tgN/bHwd3mp6iHkIHNuQoZZz19ts=; b=NNevGeAF1qEUJSbSO5UfmhyFxVEmF85ki2EBwwc5Hm9xlyQ+0cXiCNor 9djVHUbZ7+oEkfkW9BjQGT+1/G2Go5m/g/3giEns2p4gQp2kK/BA6V+1a SEjwosr8iQu1nRnmK0db8y0WMxw+DmiUUTbohJ1l6QEMy82is1MBwSvZu dWhrsctknU1ERGfCCbHxD06QA546yswx9uR03H6IibyiLQkJgJ0RxrfE6 Vk6mQyfYiUr4aoiXfueoiumo3iKfnmtolYnbQ7hSsR7emyFdq1ht3Tfxr RtBKb6cUa+E4Y2aJYPP2txcMY39TKfnhzAqv68Cre6yHLMXGGsz2cQveb g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="342592102" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="342592102" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:46:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="915490643" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by fmsmga005.fm.intel.com with ESMTP; 23 Jun 2022 19:46:47 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:46:47 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:46:46 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:46:46 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.40) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:46:46 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nGA8uPd1PkYfhxeNhM572t0hVWjs92SUakGxDthPIHEHKL/WkmB19XNb4c/f4uHKtBRlmXT53D0sk1CqcyAwpquFZoYaCfklJ9E76FkafFBQr8WqJBn5LAfolHM8NPEz0ysHFXEpZeyxS+rDOXTCHnurE9o4BKmO4jyM2GwzNh6pLgAhkeZd3456zEYPYJjLh4/iyp3e78sKE1GMngZ2Gsyrkp59zH3H1V8w1QrT2YPEqztv6v1JLyNPPxZeER+IWPFjuhBE1H3ykmOckLUDu87j+2/ShOPR3BbutPsUZ/kA9TuQk91t8dI7g8BwXwSyPAERisluwP/iOijCjdebcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gxf4a0P7ECbLbz8NoQBL7YOPQ815f5aomwrMo88WKuA=; b=LTPFIfRsFo0/TY/o56pkxNqBWDBvfbs4D+0IeQrA4m80FAwgoVz/Y6Ebt2ydMaFTGtwlKVZq1U6+hPXSu1UGe6TxA8p/wJZUSclFXNbpIgGO8jod11YhTnjs7N/mibEEfPgVcH+1qI/LAfMfjL+QC6g/KbYegkzTeHUDEnVc1dKbvn5E5Cs9QNyFO7st+yoEGY9PHLYZ2vvQcLENRjPzxw/ONgmoDz9J3SQIE5x1z8jMZc4yyzlr+tmv58Xd7cfm4WiZ8wmNHNKV5AZPKiHsinURMZ6J5YnBaBthpLMp/iQjt/yFf+wjW+ff0ZJ4jL9ITZFfwTbhPHLmjNlrKkoBNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BYAPR11MB2789.namprd11.prod.outlook.com (2603:10b6:a02:cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Fri, 24 Jun 2022 02:46:45 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:46:44 +0000 Date: Thu, 23 Jun 2022 19:46:36 -0700 From: Dan Williams To: CC: Ben Widawsky , , , , , Subject: [PATCH 13/46] cxl/hdm: Require all decoders to be enumerated Message-ID: <165603879664.551046.6863805202478861026.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MW4PR03CA0352.namprd03.prod.outlook.com (2603:10b6:303:dc::27) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2ff7ed02-d576-421b-6a42-08da558bc29d X-MS-TrafficTypeDiagnostic: BYAPR11MB2789:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d4vK4/LpbXUvIXAlfcBP/piaB7HUQ5/kIb7q9do6xzGvFTP17TRc/byudqiRyGkpS1lpixrdfnWeHEzOiw1A6xo0ApZF3MvCf5rWGXHq/54fvyhdvL+4pKs1/o8riqpFHMoUugNNJIpvB76WngeDlku7m36m6o7mr07QFwSicpZDIW6Szf3iwOV1Jygz+Qno4+pfqnuQzYrdd7gmkEQvGGs/UNhVkPl6j2j3t6e9JzwFEit4gGvFCwFo7kchdTuCHo5ZQYZe2D7kc00PYXjogmStQDk9IVy8OvhctbaaBVqp9d3j2T/EBOVcVb7vvMs1q3ORHA2aPwDSeRUUR8vnJDcCj33ITeWDhFWQZpdJXDRH3cm1cUXqCYVdyA1qp9jlFbXlnWp9xAgbD6/mqHzAL61Hy+4MjKVYnG6upo/g8PIgYGXFK+ZgGq31eSu3w0r6TzKu7S08pYZqWl3zRPS2ILjJMiTANdRJWn/t+eTZ+hpQCTV0Mw43N9aOJoh1c3c098nhekQuggS/V9fMh3VbAcV4B5naQPlN0JrfpEpJBcCfKkto6Ey4V5HKMzqE5D17bgxbYqu+dDDHjqujaZwo2GLZ37H19Bvi5x8lZHiYAmhe08i8rsbePELIdT7BUv/L3ooSzX0pcTw9Ef96YNsXe2P8w5JCCv7Pafazn4ljzxImzQjnJRTQ4kXNadoemAtteQR551h+ksd9amsdI0Yrur9mPTGh+CfIVqWWXP1tpxN80brOIxaKwbS6wDRrw1/F X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(366004)(136003)(39860400002)(396003)(376002)(346002)(8676002)(6506007)(66476007)(66556008)(6666004)(9686003)(82960400001)(33716001)(4326008)(38100700002)(6512007)(66946007)(41300700001)(478600001)(316002)(83380400001)(8936002)(86362001)(103116003)(186003)(2906002)(6916009)(6486002)(26005)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ps3J38ZwRKAGKR4zQk37PEXjR3c9ew+PuztY9y05erhpBsv+ntrXS3E3rHzicM/tutEJ3kFpixiAMyIQlpXjqljJ18pGDebVYapVrdsyJACSSrrYqfPfhEsjoQidrXDTXsoRC6yEju3HYWNZ5RiKCteZdnqqvzVZmXEl9rhZCqorfv/O37Fsc+1YE/XjA95Zcdn4/2i4mdMVP+rTpnzhQRbfUNt3A3VPMWRl+xBaeC8mjKAC/QVpox6l1ONbTyyXuH3wHzZV3kT1hX6mhO6vHwehIy+m/8q5Fw8sHjFMxlP2X3pkP4tnjSC6KZW/CXhIW3/Z4vWGr7h9lK9OxNW/B1+U7oL3ihl9kcB6crdZX5HWVY831i6kdewhPFd13mu17sbZvVg/24ESLVz1lEBKt2hiqpP1/mC/KNqbo8FD0Nd0PUAC1G4uVV/OhH8Yyj3oHvcoe6eAoFV2wMbzzd1FAGaUFQuc9iVK9KXmnIPla3kMr75AdBZbWJ9y+kJCVB7iy4dgmZmm5OILH1ESHpKS5wixREgGVpfZ1JDTrrNgBQ5Mn1w1TLJrPbBywpHha8vOXzCcACX67Xc6cIU5Q7FCHKhIRoOot3gsTL3o1gnTSnfVSD0fpy17CwrCUBJ6OE76xn7sxura6bZmZWDIFfLeP6nttUp6qTCvJoyWTXgOK2/ancgbmmDb7+T76ELwNN75eVmBF0ZH/QZcFrR30eGAMLr0gsysvnJAmUqdHF7lZQloBTAbxAQHnWCguokCaDc8lWC4bcMFm4lE6k7Fn7laut5PlLSlAWRuKGmgFS+BV4CUJ0N+PEqOAdehXsWe+k86pxS+Lrfi/SJ3f7qO86V6zsAp+Uh9gxb624gDmFHJmDXqYJks1FrxghF1ocQ7upVJx4aj2PV7QkhA9vQj3wz1tZo2N9zpOrQkGjIYJPg9M/bvjnJSBdzL6WHqPAXE4WY7sGOKxt3LtBOAcxdBIPzfqO2onTGAOZLTNbtiHpoHMqoLfDiuqWi9oTo8cOmI3zRzeuxtuDMFB1ArUzCowLSNTZZ2Tp5smAWLOul+cD3SGcPFAEQkLFDYJImaXXBpSD0mwGohj2s25KKkINM7Ft3X0Oxg2W7H3QY7B5fPTH3dmxkcpVPsii0LcuqbRFlDkE8JqSEhYWiYE9b65jO9sk/7X9NdgI+jvYblpIynBo7ZyQ4ZNy1zHYCGPaBxiSinTx7uhQQYTX1aOV8Es09SerasT8ilrboC3jYpNlG3g2JXcrZ1avYCW5VLw6mDnmUohLSvDUD8ZDm08Rj6Nlznj8X7gPE9fTr0za9cfnTuWRb+A14TV0NAvLjDTNqEXj6TerYV8BjUK1h6aWHBIwEC7NR2hUfZEJVWIUqZNDxm5HKP8q1wvTgDHfF6xk1RVa4MQFKujfmjwSX37T9Gtzws8wN69CKe0Y2V6vrK7i35ef8U6uLgKSIqplH37q09rGukeQc8URkB4cEC11q7OvZczG7sGZX17/vO9hyy20cPI7H0agLZgrR0BTXtzpkP1p1kFRWgZF5zIeTnI9f3hQkh7vbSJcLCQNRtN2/IelFnCNN/4GCJVbL0MTc9hqCDxHzFJ6PYEprEHVemB0HyR/vimPFvew== X-MS-Exchange-CrossTenant-Network-Message-Id: 2ff7ed02-d576-421b-6a42-08da558bc29d X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:46:38.1976 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gZBNH1uB651/lnk6v53CKMCOW3fRiqCjtyOHcxPwP9DbZZsDIAXZygIBs0L2tg0xFz2pUY+thgTN0GNjaX6Xm7dugMEOKfMPstJ19wLOXCo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2789 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Ben Widawsky In preparation for region provisioning all device decoders need to be enumerated since DPA allocations are calculated by summing the capacities of all decoders in a set. I.e. the programming for decoder[N] depends on the state of decoder[N-1], so skipping over decoders that fail to initialize prevents accurate DPA accounting. Signed-off-by: Ben Widawsky [djbw: reword changelog] Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- drivers/cxl/core/hdm.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index 2223d151b61b..c940a4911fee 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -199,7 +199,7 @@ int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) { void __iomem *hdm = cxlhdm->regs.hdm_decoder; struct cxl_port *port = cxlhdm->port; - int i, committed, failed; + int i, committed; u32 ctrl; /* @@ -219,7 +219,7 @@ int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) if (committed != cxlhdm->decoder_count) msleep(20); - for (i = 0, failed = 0; i < cxlhdm->decoder_count; i++) { + for (i = 0; i < cxlhdm->decoder_count; i++) { int target_map[CXL_DECODER_MAX_INTERLEAVE] = { 0 }; int rc, target_count = cxlhdm->target_count; struct cxl_decoder *cxld; @@ -250,8 +250,7 @@ int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) rc = init_hdm_decoder(port, cxld, target_map, hdm, i); if (rc) { put_device(&cxld->dev); - failed++; - continue; + return rc; } rc = add_hdm_decoder(port, cxld, target_map); if (rc) { @@ -261,11 +260,6 @@ int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) } } - if (failed == cxlhdm->decoder_count) { - dev_err(&port->dev, "No valid decoders found\n"); - return -ENXIO; - } - return 0; } EXPORT_SYMBOL_NS_GPL(devm_cxl_enumerate_decoders, CXL); From patchwork Fri Jun 24 02:46:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893330 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2294C43334 for ; Fri, 24 Jun 2022 02:47:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229549AbiFXCrB (ORCPT ); Thu, 23 Jun 2022 22:47:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229545AbiFXCrA (ORCPT ); Thu, 23 Jun 2022 22:47:00 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4756C56C3B; Thu, 23 Jun 2022 19:46:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038819; x=1687574819; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=dz3JlVvM+NCp8/ANdmpV0PgW+Aj6UnSgstLBRwYzrVg=; b=O8ri+1FZWNpTqTBlJqeV0Vt3QDgM5zm0bwTluo2+uGODkBcSpnUsEVsa k9Jx7aEmS0RvdZoeVO5rKKy2iZLXEWs/XM/hzVN4zROyZ2o0QM52koWOc jIdBzc7dAb6hxbbCRxPpgrwYZsl20iCF5ZsWwUlXAJ7qIs2Pdk0pXVZpb m/duUC3yQsqa2SUx3mGnpxGGHGxhNob+Tf+y2btbBSlAzz+CLFDG6VQ1o tzw6yfEl96MtYf5gIapOGLshsNF5i1vIqMfRf3apz/SvgfHwOennX0HaC cUwijYxobHXt008SbshkFFFLhJPzWEL2CxlJDtfQQdGYJnF2ovIFWnSaD w==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="269632529" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="269632529" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:46:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="834933872" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by fmsmga006.fm.intel.com with ESMTP; 23 Jun 2022 19:46:57 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX606.amr.corp.intel.com (10.22.229.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:46:57 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:46:57 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:46:57 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.48) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:46:56 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OQB8hxw9wtFb0dKPouYb3fhWS5DYa+FAaTMTisj4VbjwR5tuyfPUmUXUdXHoR9T/CqaExWNQA0/hsani3UZhAAMLZDO6u/vCrx2ullHaVPY3cfXXjsRsvnXauJ7uocYDo5QcWruPF8wrqrGh3VA+tpT4MX8UkEFMvajXTX5fA8IKtinPKBTH2xUPOAmss/5r+bo6bPxMWuRzsI5xsL6PSy97tvNgCzyGzAwxSzhNYs+EPkFvrzNp4YnnPY6hj+oel0+zLHRkHYY6AwxqKh2+LjmN0/5w1iKjG+9g/cepfwkQj5CRFcRlL2F68lPMM6pBm7wLnhg+ZvB6nDbftcCJvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=pdDwD6qacucb9YTQbht/3NtFFAez2c2okMTsMqRnzLs=; b=aF+mI36sh8oUvtFCXO7ptLwAUtnEgSB17iWnQabj+d455FILTRz2WnL4OL4XMugRZALlLfjeaJUayVvMXPnGBA0WXhO18GuCU3FJHw6seCBcYs3jnyHxLx1BM5P6KdRB20Cjt6mM7yCC6VOo4coQmyb8x2uMJqCIPcDxImnY+a86CIA5SdDgcpiX8tYzIo9+rI1yxVL1LSocSKjhDYjRtb4V9eBPQ568bgPiAGotc/pXcWEYwDqyz9bbbWv6gT9FiJTyuKCN87pneicEP7eKxFyFe5YPACmKfQD9uc2IMFiHrfQHEEY90HZMouDac+vlpC/fnzwdSmEnDHUU3IHEJg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BYAPR11MB2789.namprd11.prod.outlook.com (2603:10b6:a02:cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Fri, 24 Jun 2022 02:46:55 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:46:54 +0000 Date: Thu, 23 Jun 2022 19:46:44 -0700 From: Dan Williams To: CC: Ben Widawsky , , , , , Subject: [PATCH 14/46] cxl/hdm: Enumerate allocated DPA Message-ID: <165603880411.551046.9204694225111844300.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MW4PR04CA0327.namprd04.prod.outlook.com (2603:10b6:303:82::32) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d91bceac-39cd-4664-ebdf-08da558bc76d X-MS-TrafficTypeDiagnostic: BYAPR11MB2789:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YoTzZzWzJMYTgZETcE++wwiW+Bc3/gxfOy+HJlbWsFv9bS9Pu6H8TAg9DOPDwGrjtg3RURM+hCjCUxBvTdK2c/S5KtbZDTDhLBGVzuya2kwl1JQUI32TvmyDLXmyREVvY60WgdezQXA7nWCr8crBYuy8Vt+jNNjZJdQp2BnYjbStUHsn5hVFC5h4S5vL8GbktQ1gwg44/DD31vIItlSXnkkh9JmMQpF9EEfRxX5eJxJy1FwZP+EhVAfQnLdmv4BIz7rhU0M70MBHdIxA72U/CQYAh7XKCt3j1QYKSfGkYcy/fmLnDbLblWoLlocvU+24ZP5c9S8aCXuLFPaU1BVbKDp+kFe2EM/y+g+n8PVSPdoxXyveEvZqvCnHV5vZt9LPatMzy2uRzfAkN6b2tWaq/UACjA1ueiKlvgKvqRDA/06/J96pZ6heIz+Bi+D0Sq/0q9pHObwkNZNzufUD71fBndMb7utBtdMwecPq/rf+57eYMX771U9s9MG7FxzsJsGiVZII5RUdIlnlklpTKkSe0pYDraT1+mg1k+XHWyTNGctw+hLxgC+V+mHIuYsk8qku57ce4NqARoKkPCNkWdw5vN45jNI1caceRTOk+1fHvjXdahx0Rxdxo9IkJAi3da/Y4zyoFDu0e5OqS9yqrxLh9LZjdrWcFz9vYEjnrSfWZJH4Sp9rJ2FDZtzahvjJKj5fx/iQ1Hegq9X+YGVNhTcam0993kbYAAWt2bsFJp60xdeAQ7mGLZ7GrYAreQimAkQG X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(366004)(136003)(39860400002)(396003)(376002)(346002)(8676002)(6506007)(66476007)(66556008)(6666004)(9686003)(82960400001)(33716001)(4326008)(38100700002)(6512007)(66946007)(41300700001)(478600001)(316002)(83380400001)(8936002)(86362001)(103116003)(186003)(2906002)(6916009)(6486002)(26005)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aTc3e3J89KqnwehVkufvF3ug8XAXtRUvsTk/adRoEg/Om4I1aQCST9+yg4VLOVakiAGh0tmTH+iLmtoPYde25K69hRvvbWt2ZEKC1o2cKnqZrVWESW8WHX04PJ1UCF/LeMd/RCPCWRxBvM3zUkTAbG6e7TWLEYHmLRURNj8qTkCa+86+DfGdO6/XRgqU6eiok9HL51XqfVRoPmAo2cz9CmZnTBmGMvf1ZkjLIj7S4c4GcFf+wZvFYfrAT02NebN5XZnNcedo0zbJCCK8OqUTqrbmk0xyL1bbf+n1oqt2WsSESD6mQnUU4y0V6xFrAERvvw+8ncPrM42ZocVf8wyKKdoMPm4V99mB5n3K+WTBzyzBrLGvxp5udhohVe5j4acPXuSiIou6klZnflmR73I5CT/GE2RvcdDMW66IXTfMoZNbLDy78hPtA96hH2tWVbUItLLZWDTpQ6f5CGsr5xhwJgSnHAbeNFrkkMAwvZlr4B2IvOzdqee1G1HV+JDytJ2A/gq80EjmAyACGzgkK1DALNhXcT/HyVSanot5og8aWQCMPtXFg3oh+/XRgxDcuB/D7gZHx8g87EwKa0zQqcI+aMTgtWRLg9F941Cgfxdi0DbnBFBOsfgr5/nU6O8dLp3/Wy5WRsFDV42Dx7wTWobvLCVGKt1W9HNLe+GDwh1RLc1Qh7O7qetKJglNHdKfR8Zu3aLW5F+zTMx3SDIFxsXVvZfsN5azprgBWh9+fTbAMwAGdRAPe+pMl+lpmeSJwGrwibyAxgbAwLDvfYOp4pkmuE4meiU6rzZDb8y/htghVsQiLNAj51FpRt5QRWOSQ9W0pWnsXeN+FF4KJtZb5tAtq1TAx4B6dHI2qfB7s0O1P9OcgH6HLeVF4r/PaYZM1HRV9iMLWfJmb5Ip0yoN1twr5mGz+48ptK3ysI7mu9KV00lMoZ+Pouztgn3nz5cCiQ/9S2w7vkhQJGAZCPAh28COl/HPh9BgFWs4iH2URxPxpBfs/TWS+clreex+5mcO26plm0pbLzoGB0SVglAUUe8mk4lVBRNZxc0052Fm64f8ia2fWqhwZV1viskRT3RwjhCZltVJzPqyeRMSUBhUThpG/m+CAn7xi89K3O8xPY+ODWWgvWlaJKmV1YeEM+EpMoglwntSVZz0hHkO9hWZczuA7ZCykzLqbvBm8svng3hypeanb3XCDJoubH9KuGJ9PFjPwYDFEIxVU/YkORgtLJ1SVYeZXTQnU4us2u7XC5o+q5avdr7qJVHb5/Jm3/sU53JLfr2kATtLA0rHOLS9hdydGHYYRaAZSEBaUBLh6HgCFI5M73COM0OdyVvdy9ZydasnlF96k9XGKJU9wxOgMtuuchUtiHAmfnYYT4vK904DW5oXD4O1FXyK1qW239DCrUb9dBQ7HdheUJ6Oi2S3g1KtXJV7kHsSZn2AI51m+5Bx3aD9IvIiHyKsUm3v+M7RXjdY6UaGdzF5LQECqUggu9cM5fSGcpiF0PQqk2WdKbLiKPN+1V9SiRPVDWgxg72rbdACcxBBRMtQwq0bBqzCrPUbBvFIxcrbm6ZSpZBpCxgqI6pgJtW3PaPVaNJOoyOHjIMorE1bCxt6ov3Z5+3FO0tXGQ== X-MS-Exchange-CrossTenant-Network-Message-Id: d91bceac-39cd-4664-ebdf-08da558bc76d X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:46:46.3218 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: JG6ppHoG1+8qY/0ySOyAqckhKUQNFnEu0VVDv2DMX3AXKfXT2z9bNBQnpx8nTuI4Cx63h8KBEVxh3OS9lc1ARGOJP7NQweDmmDMtfuk5+Zo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2789 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org In preparation for provisioining CXL regions, add accounting for the DPA space consumed by existing regions / decoders. Recall, a CXL region is a memory range comrpised from one or more endpoint devices contributing a mapping of their DPA into HPA space through a decoder. Record the DPA ranges covered by committed decoders at initial probe of endpoint ports relative to a per-device resource tree of the DPA type (pmem or volaltile-ram). The cxl_dpa_rwsem semaphore is introduced to globally synchronize DPA state across all endpoints and their decoders at once. The vast majority of DPA operations are reads as region creation is expected to be as rare as disk partitioning and volume creation. The device_lock() for this synchronization is specifically avoided for concern of entangling with sysfs attribute removal. Co-developed-by: Ben Widawsky Signed-off-by: Ben Widawsky Signed-off-by: Dan Williams --- drivers/cxl/core/hdm.c | 148 ++++++++++++++++++++++++++++++++++++++++++++---- drivers/cxl/cxl.h | 2 + drivers/cxl/cxlmem.h | 13 ++++ 3 files changed, 152 insertions(+), 11 deletions(-) diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index c940a4911fee..daae6e533146 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -7,6 +7,8 @@ #include "cxlmem.h" #include "core.h" +static DECLARE_RWSEM(cxl_dpa_rwsem); + /** * DOC: cxl core hdm * @@ -128,10 +130,108 @@ struct cxl_hdm *devm_cxl_setup_hdm(struct cxl_port *port) } EXPORT_SYMBOL_NS_GPL(devm_cxl_setup_hdm, CXL); +/* + * Must be called in a context that synchronizes against this decoder's + * port ->remove() callback (like an endpoint decoder sysfs attribute) + */ +static void cxl_dpa_release(void *cxled); +static void __cxl_dpa_release(struct cxl_endpoint_decoder *cxled, bool remove_action) +{ + struct cxl_port *port = cxled_to_port(cxled); + struct cxl_memdev *cxlmd = cxled_to_memdev(cxled); + struct cxl_dev_state *cxlds = cxlmd->cxlds; + struct resource *res = cxled->dpa_res; + + lockdep_assert_held_write(&cxl_dpa_rwsem); + + if (remove_action) + devm_remove_action(&port->dev, cxl_dpa_release, cxled); + + if (cxled->skip) + __release_region(&cxlds->dpa_res, res->start - cxled->skip, + cxled->skip); + cxled->skip = 0; + __release_region(&cxlds->dpa_res, res->start, resource_size(res)); + cxled->dpa_res = NULL; +} + +static void cxl_dpa_release(void *cxled) +{ + down_write(&cxl_dpa_rwsem); + __cxl_dpa_release(cxled, false); + up_write(&cxl_dpa_rwsem); +} + +static int __cxl_dpa_reserve(struct cxl_endpoint_decoder *cxled, + resource_size_t base, resource_size_t len, + resource_size_t skip) +{ + struct cxl_memdev *cxlmd = cxled_to_memdev(cxled); + struct cxl_port *port = cxled_to_port(cxled); + struct cxl_dev_state *cxlds = cxlmd->cxlds; + struct device *dev = &port->dev; + struct resource *res; + + lockdep_assert_held_write(&cxl_dpa_rwsem); + + if (!len) + return 0; + + if (cxled->dpa_res) { + dev_dbg(dev, "decoder%d.%d: existing allocation %pr assigned\n", + port->id, cxled->cxld.id, cxled->dpa_res); + return -EBUSY; + } + + if (skip) { + res = __request_region(&cxlds->dpa_res, base - skip, skip, + dev_name(dev), 0); + if (!res) { + dev_dbg(dev, + "decoder%d.%d: failed to reserve skip space\n", + port->id, cxled->cxld.id); + return -EBUSY; + } + } + res = __request_region(&cxlds->dpa_res, base, len, dev_name(dev), 0); + if (!res) { + dev_dbg(dev, "decoder%d.%d: failed to reserve allocation\n", + port->id, cxled->cxld.id); + if (skip) + __release_region(&cxlds->dpa_res, base - skip, skip); + return -EBUSY; + } + cxled->dpa_res = res; + cxled->skip = skip; + + return 0; +} + +static int cxl_dpa_reserve(struct cxl_endpoint_decoder *cxled, + resource_size_t base, resource_size_t len, + resource_size_t skip) +{ + struct cxl_port *port = cxled_to_port(cxled); + int rc; + + down_write(&cxl_dpa_rwsem); + rc = __cxl_dpa_reserve(cxled, base, len, skip); + up_write(&cxl_dpa_rwsem); + + if (rc) + return rc; + + return devm_add_action_or_reset(&port->dev, cxl_dpa_release, cxled); +} + static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, - int *target_map, void __iomem *hdm, int which) + int *target_map, void __iomem *hdm, int which, + u64 *dpa_base) { - u64 size, base; + struct cxl_endpoint_decoder *cxled = NULL; + u64 size, base, skip, dpa_size; + bool committed; + u32 remainder; int i, rc; u32 ctrl; union { @@ -139,11 +239,15 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, unsigned char target_id[8]; } target_list; + if (is_endpoint_decoder(&cxld->dev)) + cxled = to_cxl_endpoint_decoder(&cxld->dev); + ctrl = readl(hdm + CXL_HDM_DECODER0_CTRL_OFFSET(which)); base = ioread64_hi_lo(hdm + CXL_HDM_DECODER0_BASE_LOW_OFFSET(which)); size = ioread64_hi_lo(hdm + CXL_HDM_DECODER0_SIZE_LOW_OFFSET(which)); + committed = !!(ctrl & CXL_HDM_DECODER0_CTRL_COMMITTED); - if (!(ctrl & CXL_HDM_DECODER0_CTRL_COMMITTED)) + if (!committed) size = 0; if (base == U64_MAX || size == U64_MAX) { dev_warn(&port->dev, "decoder%d.%d: Invalid resource range\n", @@ -156,8 +260,8 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, .end = base + size - 1, }; - /* switch decoders are always enabled if committed */ - if (ctrl & CXL_HDM_DECODER0_CTRL_COMMITTED) { + /* decoders are enabled if committed */ + if (committed) { cxld->flags |= CXL_DECODER_F_ENABLE; if (ctrl & CXL_HDM_DECODER0_CTRL_LOCK) cxld->flags |= CXL_DECODER_F_LOCK; @@ -180,14 +284,35 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, else cxld->target_type = CXL_DECODER_ACCELERATOR; - if (is_endpoint_decoder(&cxld->dev)) + if (!cxled) { + target_list.value = + ioread64_hi_lo(hdm + CXL_HDM_DECODER0_TL_LOW(which)); + for (i = 0; i < cxld->interleave_ways; i++) + target_map[i] = target_list.target_id[i]; + return 0; + } - target_list.value = - ioread64_hi_lo(hdm + CXL_HDM_DECODER0_TL_LOW(which)); - for (i = 0; i < cxld->interleave_ways; i++) - target_map[i] = target_list.target_id[i]; + if (!committed) + return 0; + dpa_size = div_u64_rem(size, cxld->interleave_ways, &remainder); + if (remainder) { + dev_err(&port->dev, + "decoder%d.%d: invalid committed configuration size: %#llx ways: %d\n", + port->id, cxld->id, size, cxld->interleave_ways); + return -ENXIO; + } + skip = ioread64_hi_lo(hdm + CXL_HDM_DECODER0_SKIP_LOW(which)); + rc = cxl_dpa_reserve(cxled, *dpa_base + skip, dpa_size, skip); + if (rc) { + dev_err(&port->dev, + "decoder%d.%d: Failed to reserve DPA range %#llx - %#llx\n (%d)", + port->id, cxld->id, *dpa_base, + *dpa_base + dpa_size + skip - 1, rc); + return rc; + } + *dpa_base += dpa_size + skip; return 0; } @@ -200,6 +325,7 @@ int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) void __iomem *hdm = cxlhdm->regs.hdm_decoder; struct cxl_port *port = cxlhdm->port; int i, committed; + u64 dpa_base = 0; u32 ctrl; /* @@ -247,7 +373,7 @@ int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) return PTR_ERR(cxld); } - rc = init_hdm_decoder(port, cxld, target_map, hdm, i); + rc = init_hdm_decoder(port, cxld, target_map, hdm, i, &dpa_base); if (rc) { put_device(&cxld->dev); return rc; diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 579f2d802396..6832d6d70548 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -56,6 +56,8 @@ #define CXL_HDM_DECODER0_CTRL_TYPE BIT(12) #define CXL_HDM_DECODER0_TL_LOW(i) (0x20 * (i) + 0x24) #define CXL_HDM_DECODER0_TL_HIGH(i) (0x20 * (i) + 0x28) +#define CXL_HDM_DECODER0_SKIP_LOW(i) CXL_HDM_DECODER0_TL_LOW(i) +#define CXL_HDM_DECODER0_SKIP_HIGH(i) CXL_HDM_DECODER0_TL_HIGH(i) static inline int cxl_hdm_decoder_count(u32 cap_hdr) { diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h index a9609d40643f..b4e5ed9eabc9 100644 --- a/drivers/cxl/cxlmem.h +++ b/drivers/cxl/cxlmem.h @@ -50,6 +50,19 @@ static inline struct cxl_memdev *to_cxl_memdev(struct device *dev) return container_of(dev, struct cxl_memdev, dev); } +static inline struct cxl_port *cxled_to_port(struct cxl_endpoint_decoder *cxled) +{ + return to_cxl_port(cxled->cxld.dev.parent); +} + +static inline struct cxl_memdev * +cxled_to_memdev(struct cxl_endpoint_decoder *cxled) +{ + struct cxl_port *port = to_cxl_port(cxled->cxld.dev.parent); + + return to_cxl_memdev(port->uport); +} + bool is_cxl_memdev(struct device *dev); static inline bool is_cxl_endpoint(struct cxl_port *port) { From patchwork Fri Jun 24 02:46:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893331 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B869C43334 for ; Fri, 24 Jun 2022 02:47:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229545AbiFXCrN (ORCPT ); Thu, 23 Jun 2022 22:47:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230090AbiFXCrK (ORCPT ); Thu, 23 Jun 2022 22:47:10 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C22356F8C; Thu, 23 Jun 2022 19:47:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038829; x=1687574829; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=j8Jqg6GjtO4oyOLK+avUMz0EwIR0SoGPj9+PpgnsmgM=; b=RGh/73iVN5tlSkM0tFYhoFdLuDUrmt5ow5oICpHmJZO/j98/AAJphF+C LuALqULZpjVFYROdBLKexksMhDrLkJjjyRi5V8m07SiZ4rwsII1+IaaJ9 rIn35BO1fneJhazFixninqNdc/yHFzXmIg88cbpOWd2Vh6tHVMSxjdOF9 Dr7POPmY6b0oBC3i52eIgtFhymLwp+/5oktKQRUu63PjaT8/cdG7NA0vI ujCvuzrVEGbPud5FRN8cWBopcQvvoSpHniOwTG6KzV4RHjHOsYhtDwXXq MkHG/sIoahTXiv5nqjTRB6/yUCEuTq6bh7T43MPzVHjAA+Md0WYi6mL3A w==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="344898466" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="344898466" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:47:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="834933943" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga006.fm.intel.com with ESMTP; 23 Jun 2022 19:47:08 -0700 Received: from fmsmsx609.amr.corp.intel.com (10.18.126.89) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:47:08 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx609.amr.corp.intel.com (10.18.126.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:47:08 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.47) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:47:07 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kJsplBNCTyu7lPG9hbUF0YU5fdzUzAKj93MLDkkEW5ME4n/1qlj3AAOxL09x6Em751SGTVFJEbwnC+AiYXvufv16FI9snOQB4hKxYfS9SXah+kgUcaybnQ3j4Ug9f5VNS/FRviUsFaVZ50pN/kYSlec9mxKw0QeF47I1VOxkZreNH1iH8i7v9/bmWNACSeVkVI5lHv/nRCvXoCtNNTcRkxXEDx9TDhhiJNBUI3ZpuQSvCIQe+g6BA2mieOmLvSZVuBk1QO26/7c1owAw+CR/uGQUWOM385M+oR149F0U9qimjfYl1fICB7FNHC1huXdGC76G7HX5EFcNbrvO2dxOaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ltLtuWAepkVbs+YARMmGIhmlgZHwq/j+hzV5HABNb6U=; b=OGEC/0PpFMbqyxLaVcd/3DOV8qSj/RomFTdRac7f1l8ZKfDx/TzSU6VBln2t2he9utMj6H3yL0vJqJkCr/cqGS+MUwmTHdjxdYFl1MR8ZIuc3aXAQ2d5e2Ewc9WRXy+bqfZEDBCIvIfIhPcI+o7ApwD2tevRkkxxztafTK5SjXYFrrdW307xWpvYckQS9JsHbrYkwHujK3dl0SRxMQZ0Eqd4qz/9DqAe/QKwSa2dtqBEUIoTNe5+GinbCIY++BkHUuF/7THirmuxuL4AG+eLa8L13Fr0r0avegG2cMh1DDy6ZsQOMy1MWdFzyohS7IQF8d+0qUAV9WlDF5GUt4pQZQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BYAPR11MB2789.namprd11.prod.outlook.com (2603:10b6:a02:cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Fri, 24 Jun 2022 02:47:06 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:47:06 +0000 Date: Thu, 23 Jun 2022 19:46:52 -0700 From: Dan Williams To: CC: Alison Schofield , , , , Subject: [PATCH 15/46] cxl/Documentation: List attribute permissions Message-ID: <165603881198.551046.12893348287451903699.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MWHPR12CA0055.namprd12.prod.outlook.com (2603:10b6:300:103::17) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 54fb4d80-616a-40fd-fb09-08da558bcc09 X-MS-TrafficTypeDiagnostic: BYAPR11MB2789:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zuOeaAyERcspGDgoQ82ElP1o63KC6Ijh9wff4v/zC5wEJCQLFTSjzgYWbICkA13DYzXqzMQI1vRmbYIv2hsC2aZqtpnbgSKIMfEYVdDKurmoxmUB4GCmlZBKmMDGVcgXbm4rNOHBLssPhjiZsOZmzuj9VmOyvgaamuteoM+Yn7F2QXUvIUTKZFoHza5mAC1X9/cB9mcuQqv/S4mqUkFBQJv47IQTqwABSxXBJ7PwptHBZp8m+XbR2e1dytQZd6eysfUSIl8bEeHXn0bzbiRXq0sc1FiM6g95UxDvoGOlAtXx2btmoQIRdbeiYlXRSttERjcZMa3C4rVwf5oZxGQQkMhXNp1BqWSQaU2txuudu5L2MKpXa+7qzD/UhjrJHeHKQSCwH+HBgBKkS5kJImI/sR+U4Ua/R+esTTr8JnJBySFilaqw5RcVLHnUaNnhiA0b0swG0zmcJ1mDmmlCh31vMD3QxL19C9z9iEx8EdTJ2iTKtZzMPMXUFQZuLk+zMQbLs0DcBBPH4+7IvTv5oFt/9nVZaKRQmne942u9cjhvfoAZ4WINLzdAGgedVy4nn9yqwzi1lO2pxkiJbtKDXFfg52lCyRDFem/OdnP6XlZg2sqRkvOf8a/JNx9NK4Dlef/p8VDUrVOXwQdwLQGIjSK9YlpSM6VyWKNZ3kGsOTdHcXvkZF03c/+GdgN11euYBH3zlsUbxTD2xbzxxiEL+0TOezlMxzgKxQSRYq1Nc0+kl7wk1iKvyKJlLJHxPR/huX3y X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(366004)(136003)(39860400002)(396003)(376002)(346002)(8676002)(6506007)(66476007)(66556008)(6666004)(9686003)(82960400001)(33716001)(4326008)(38100700002)(6512007)(66946007)(41300700001)(478600001)(316002)(83380400001)(8936002)(86362001)(103116003)(186003)(2906002)(6916009)(6486002)(26005)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EiDz7bUNoYuS3qUzNJ6PAkvC+DF+nvRG8NarTwRAFU7haA+tRGQUOhyB6T5tjFv/MSa3HFR+S8tw6KPEGNDKHPDRI+xhU7+ynDGQWu1VobMp1IPT5ERidr8vSe97HJIgi7JExzu4Mxmq88z/BFBrSIGhTp1LECTfJDRVecABAAoAAMeL27r29WvNgm+eA+VrXt5RJoUXem8hdE6Fcu9E6tLzqvJRdxEcrPPPHWRjRuAC2dRy8MO6sfLxud+wONBJNpfse6EVA20Lmi9ptxP3uCxHETi1mHowpHchniwem9tEP+mBg2q62gmp/ccnat9hmtodfcKnnD/R1i4a4hMZuiiiAYaMe9CqUKhgZJSloKlQ2F/LeYqbFlpWZBFXyWDSS03qPon4WT/AOJQ0MpHFliXiv4WMAFsklz2GuWmJM6gpGG4x/txRNvxdAnfgNzQcU/kqz8y5D7FQ4TF5qkKKD85dT3gZJrjeDXXuhIto4Df2FcA4B6Yv4DjW6PEjRh8dZRoqAWcmku6odw3jVMUx8bQrmQ4PYWSqWGwBM45b6/gUp3BXaf9LehYZw1QM2zmAbaky8MBT0mvZkQoNRto3WdMhL+T/Ord+V63bdfg6U4c/ayfS2DMO2UxE/OYf+iIDfQiZ6yub/RRETjZzbMSJEkdx69rBr2Ag0jSyvLDEeS6+yJRUvnmFXskSTo0vSXW3cvLiDXOLjtdip/Jgy2aE5L8n5Zce2tqyOmbWmra60Q9FUCMHGh+g3OQDDKUZI9ZCCGKI+OmYC5vAgwiDYmbfigCaypOpbpR0NGg2+BzJwB19qE9zOqA1QKuQQ0Q5LVQlly8/+Hne0YB6L59feVsFwomSb+PyotwaKE+GNImDR8cA2I9kFuB/zia0PsGqD8xGlEgeqaqILKXlqr3YOjvbqJ8LyQhGCTyQRiPlosj5TQT8J3zI9yfUCyV13C+oGhA4rzCnBS6Ah34/fUTRSt//xwCCFO9bMfTCPPJM809cyauWbFfog7p5p9s6X3/B4LsVEqhgOkf0Y6YeXmBe9gndxUDJo3+hSzTOBih2OwX8NGISZ1bYgHpIyIUcaDzQc7XxOagvrcYtlaOygxocIU716mAddekd5FKaiI1FK0IRhSK79rotYZO1QPl8zLGQ1TiD0k1u9GuEFz74YeseW1rTqr79RCE3JK53iMB3Vq9+tUICS+8iOc6auRuiYzfug8IpKsDsxokaKFyFghqMBCoNvO3BS+WthzdXY9H1F0WzZo6ED2y3G3F8hWKHLadilVf/if7QpDVg3OSA6sDZTrKrRVnEPQMmN90Yo8g7Js2ynN2rDsO2nDzxXjJC8wyrZXF4Jww52X9jieLD1i0fWVB/gr/ds9m5EJufNkPjXoeJuuat3opalED2hnp0kyJU071l62vEkbR83Y9H4QMZQmWOnm6svXKBUdkORrjOa9Nmk/DKihC/GrgbaA9qKwHUSlMzy3nYmaWypOt66ZiBxyWzLKQL8KJP6rr+yHHQi57Tu8a+zg8stQURT6pR8lgmyF0cfW1d1B7HWORPZh6hr8n/LB12HCMcNyNAIuqo7k7YhLlWzJphqnUU5clr6d1b5IEbKXYAhXhCZzIwjrw8k3Oltw== X-MS-Exchange-CrossTenant-Network-Message-Id: 54fb4d80-616a-40fd-fb09-08da558bcc09 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:46:53.9617 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Fp9DMtNJdb4WKoXdIVHxvigpOL/5tFl0x+qLKn3azzH7FOy3NZ9IVeTzDOwky2rpX8hG8e2mIgeWcA+fHvZVyOU1tEkHWr//D1HHpZCseDM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2789 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Clarify the access permission of CXL sysfs attributes in the documentation to help development of userspace tooling. Reported-by: Alison Schofield Signed-off-by: Dan Williams Reviewed-by: Alison Schofield Reviewed-by: Jonathan Cameron --- Documentation/ABI/testing/sysfs-bus-cxl | 81 ++++++++++++++++--------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-bus-cxl b/Documentation/ABI/testing/sysfs-bus-cxl index 7c2b846521f3..1fd5984b6158 100644 --- a/Documentation/ABI/testing/sysfs-bus-cxl +++ b/Documentation/ABI/testing/sysfs-bus-cxl @@ -57,28 +57,28 @@ Date: June, 2021 KernelVersion: v5.14 Contact: linux-cxl@vger.kernel.org Description: - CXL device objects export the devtype attribute which mirrors - the same value communicated in the DEVTYPE environment variable - for uevents for devices on the "cxl" bus. + (RO) CXL device objects export the devtype attribute which + mirrors the same value communicated in the DEVTYPE environment + variable for uevents for devices on the "cxl" bus. What: /sys/bus/cxl/devices/*/modalias Date: December, 2021 KernelVersion: v5.18 Contact: linux-cxl@vger.kernel.org Description: - CXL device objects export the modalias attribute which mirrors - the same value communicated in the MODALIAS environment variable - for uevents for devices on the "cxl" bus. + (RO) CXL device objects export the modalias attribute which + mirrors the same value communicated in the MODALIAS environment + variable for uevents for devices on the "cxl" bus. What: /sys/bus/cxl/devices/portX/uport Date: June, 2021 KernelVersion: v5.14 Contact: linux-cxl@vger.kernel.org Description: - CXL port objects are enumerated from either a platform firmware - device (ACPI0017 and ACPI0016) or PCIe switch upstream port with - CXL component registers. The 'uport' symlink connects the CXL - portX object to the device that published the CXL port + (RO) CXL port objects are enumerated from either a platform + firmware device (ACPI0017 and ACPI0016) or PCIe switch upstream + port with CXL component registers. The 'uport' symlink connects + the CXL portX object to the device that published the CXL port capability. What: /sys/bus/cxl/devices/portX/dportY @@ -86,20 +86,20 @@ Date: June, 2021 KernelVersion: v5.14 Contact: linux-cxl@vger.kernel.org Description: - CXL port objects are enumerated from either a platform firmware - device (ACPI0017 and ACPI0016) or PCIe switch upstream port with - CXL component registers. The 'dportY' symlink identifies one or - more downstream ports that the upstream port may target in its - decode of CXL memory resources. The 'Y' integer reflects the - hardware port unique-id used in the hardware decoder target - list. + (RO) CXL port objects are enumerated from either a platform + firmware device (ACPI0017 and ACPI0016) or PCIe switch upstream + port with CXL component registers. The 'dportY' symlink + identifies one or more downstream ports that the upstream port + may target in its decode of CXL memory resources. The 'Y' + integer reflects the hardware port unique-id used in the + hardware decoder target list. What: /sys/bus/cxl/devices/decoderX.Y Date: June, 2021 KernelVersion: v5.14 Contact: linux-cxl@vger.kernel.org Description: - CXL decoder objects are enumerated from either a platform + (RO) CXL decoder objects are enumerated from either a platform firmware description, or a CXL HDM decoder register set in a PCIe device (see CXL 2.0 section 8.2.5.12 CXL HDM Decoder Capability Structure). The 'X' in decoderX.Y represents the @@ -111,42 +111,43 @@ Date: June, 2021 KernelVersion: v5.14 Contact: linux-cxl@vger.kernel.org Description: - The 'start' and 'size' attributes together convey the physical - address base and number of bytes mapped in the decoder's decode - window. For decoders of devtype "cxl_decoder_root" the address - range is fixed. For decoders of devtype "cxl_decoder_switch" the - address is bounded by the decode range of the cxl_port ancestor - of the decoder's cxl_port, and dynamically updates based on the - active memory regions in that address space. + (RO) The 'start' and 'size' attributes together convey the + physical address base and number of bytes mapped in the + decoder's decode window. For decoders of devtype + "cxl_decoder_root" the address range is fixed. For decoders of + devtype "cxl_decoder_switch" the address is bounded by the + decode range of the cxl_port ancestor of the decoder's cxl_port, + and dynamically updates based on the active memory regions in + that address space. What: /sys/bus/cxl/devices/decoderX.Y/locked Date: June, 2021 KernelVersion: v5.14 Contact: linux-cxl@vger.kernel.org Description: - CXL HDM decoders have the capability to lock the configuration - until the next device reset. For decoders of devtype - "cxl_decoder_root" there is no standard facility to unlock them. - For decoders of devtype "cxl_decoder_switch" a secondary bus - reset, of the PCIe bridge that provides the bus for this - decoders uport, unlocks / resets the decoder. + (RO) CXL HDM decoders have the capability to lock the + configuration until the next device reset. For decoders of + devtype "cxl_decoder_root" there is no standard facility to + unlock them. For decoders of devtype "cxl_decoder_switch" a + secondary bus reset, of the PCIe bridge that provides the bus + for this decoders uport, unlocks / resets the decoder. What: /sys/bus/cxl/devices/decoderX.Y/target_list Date: June, 2021 KernelVersion: v5.14 Contact: linux-cxl@vger.kernel.org Description: - Display a comma separated list of the current decoder target - configuration. The list is ordered by the current configured - interleave order of the decoder's dport instances. Each entry in - the list is a dport id. + (RO) Display a comma separated list of the current decoder + target configuration. The list is ordered by the current + configured interleave order of the decoder's dport instances. + Each entry in the list is a dport id. What: /sys/bus/cxl/devices/decoderX.Y/cap_{pmem,ram,type2,type3} Date: June, 2021 KernelVersion: v5.14 Contact: linux-cxl@vger.kernel.org Description: - When a CXL decoder is of devtype "cxl_decoder_root", it + (RO) When a CXL decoder is of devtype "cxl_decoder_root", it represents a fixed memory window identified by platform firmware. A fixed window may only support a subset of memory types. The 'cap_*' attributes indicate whether persistent @@ -158,8 +159,8 @@ Date: June, 2021 KernelVersion: v5.14 Contact: linux-cxl@vger.kernel.org Description: - When a CXL decoder is of devtype "cxl_decoder_switch", it can - optionally decode either accelerator memory (type-2) or expander - memory (type-3). The 'target_type' attribute indicates the - current setting which may dynamically change based on what + (RO) When a CXL decoder is of devtype "cxl_decoder_switch", it + can optionally decode either accelerator memory (type-2) or + expander memory (type-3). The 'target_type' attribute indicates + the current setting which may dynamically change based on what memory regions are activated in this decode hierarchy. From patchwork Fri Jun 24 02:46:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893332 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 736F0C433EF for ; Fri, 24 Jun 2022 02:47:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229981AbiFXCr1 (ORCPT ); Thu, 23 Jun 2022 22:47:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230090AbiFXCrV (ORCPT ); Thu, 23 Jun 2022 22:47:21 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E207056F8C; Thu, 23 Jun 2022 19:47:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038838; x=1687574838; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=cH1NsLuJycPAH4dmJHmiUppgm54AwXkpuVfIYJjOXCA=; b=eqWxemmrPJsGoq2MFei2O3xx9I5kC+IOHbRbxxeeBWgu5l543XNzAPDK Egd5QdxJt/GSVeI1s0V4gIWIhDleWfI9Th/wantnetjBuUMmjEGNhE+SQ Q11joYROoPus6pponngKnpkoNi/KSAQHczG3TtfDHg7HP7rYB/UYLO2LK xb+GEGljiYq2Aeju+qyz4gjUNPMKK9mXLGrS+tQdiF2Sgsz1X9q9jRgXz LgwMGaP3rmhrz0UBl7FVZ0gCgPssbNvY2pJKGS0I4MVzzx5S95wza0sQy tDlBA/WOfaU4lrrQ/Gd4MLDWJ04e1Fs+HNiPxYJf/w5qfOeuZPwcuynPM g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="269632611" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="269632611" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:47:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="678352604" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by FMSMGA003.fm.intel.com with ESMTP; 23 Jun 2022 19:47:18 -0700 Received: from fmsmsx604.amr.corp.intel.com (10.18.126.84) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:47:17 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx604.amr.corp.intel.com (10.18.126.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:47:17 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.46) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:47:17 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QnGPxMuqYPcNBpRZhr57uT+mpkxD1k0S1socxJtFGDJoiHOxMjNvdSxCwGBXDkjZ6qKGRmRa9YhrHSBO4a7sBmpOq0NUat+/BWLh1bi0kpNitD9bBxDH392Z1zNJeFaj7ySwfcb4nMZ5kpgTTSXO39x2d3XdfjnCEHucGeRS0eh+hhKz+Kz7shSdLK3wQdt6JTubllqJ3taAwVJlFSKgHc+eycW0Lf9GTleSIb8Y5F2+r1YRi1khuVI7uXgDPY3e2Cxwt+LJc4Hyb7ZcmFbdNL8fcT9N8oVTrkgS8X+/wZ6UelxUaKXi/Hgf0zJfkvzwd8HxKSfvsjwJWIB3eALn0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Yggvu6zgR7pfSSwi2CNLWy2a/rgTnsvIA/617IsPme8=; b=a0x7kfI3sgcH7MyUZBtUlQ5qb6r52V7x9hPxGnLO1mEFzqEc28uJIRISY0r46jkLh1v8ApSB5iqLOTJxmopIBNL7k50YYqhwuL9RbF+Ewjdk4N6DMcYzf25vgLmx09vhgU5eaNYGKCvhhUDendG/X3oaZWWTS3MBzuGYvBUi60SPnko7md6HWGsXuPfkTmaYqWT8DJJj9hZ9QMc7xagROHsxyUJOjd3WVXrh0gCOt7ax7jp5rAjXLZvgGY5xKqG5psjj0hMw6w+SLY8Bp3Jar4uz2n34Eyd1fn+euAvMsc9roN5fHGkQYNYObKBeYlHAgMDnJWOY+QmuuIiTbj73xg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BYAPR11MB2789.namprd11.prod.outlook.com (2603:10b6:a02:cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Fri, 24 Jun 2022 02:47:16 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:47:16 +0000 Date: Thu, 23 Jun 2022 19:46:59 -0700 From: Dan Williams To: CC: , , , , Subject: [PATCH 16/46] cxl/hdm: Add 'mode' attribute to decoder objects Message-ID: <165603881967.551046.6007594190951596439.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MWHPR14CA0038.namprd14.prod.outlook.com (2603:10b6:300:12b::24) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7840c86e-a364-4c85-bc6a-08da558bd097 X-MS-TrafficTypeDiagnostic: BYAPR11MB2789:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /iLil0337n4i1JA+0tKTSHPBXoL7ujWXLR5aJrDL7m8mF2AifAjTlNp6phLD6WbkfaiCdTmVGTJqXPQ1ziKdU7LRxBPNpHImIXyd/uK7xIU6LsLOQdo1SxMW6T8PNnNyRMs/MeTnkdQFTW3H9ZZr2a/djXSjXgwrGH7V6Y7S4KmHtL4PnYfnLyqWVZYPKbUaGpVDUGm99Ujz9jv6HC8h50y9LmE46Kllmphp7U/7w3LGJ3YEwzTKi9HmtWdAHLzW33ocaSnrYMycnx0uJqNQCMLqtsEFW4n89CfVuM+Z0wnsi2WWbP+iGl2Tpr5smnmTRCmCIWJb1XNUuuCyVasmvkFK6TkhK2ZfksU+cej1NmpsXfhaxHorx/v43iGMR2Ggep1X518sLsMS0w+tZyzCa0DO83RBtIzPmSoz/DfRynUe7uomeIgvNPZf+1QAMd3Mxcm51mkRegtyvSG/2Y9KSyXgFHqnFhOI7k8H7kqljt0tRdlZfUhNbq3akLP+S9UdDqvz1A003n3e5GG1L6lhYrD5JsQpUBWttPZqdfUUX+DaWLttlF72yRjGN51Prm/YFvZM1wCVs+bvjl3LtY4FnUc7Hiy2AeOQrT2r0JZ+oauZT68PoX2AFB6UKhbdN9rz/inBwADM91HlaWsDgxoBwC1Dk34Y9WpAjblW+UgpBuNNVKE0ZHz76bgCMN5kERGurM+wqt1Xt360IepCseaefU0P2CJRoqrIgOZ18fGi1tWgT64r8bIMt+w66HvVzYsD X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(366004)(136003)(39860400002)(396003)(376002)(346002)(8676002)(6506007)(66476007)(66556008)(6666004)(9686003)(82960400001)(33716001)(4326008)(38100700002)(6512007)(66946007)(41300700001)(478600001)(316002)(83380400001)(8936002)(86362001)(103116003)(186003)(2906002)(6916009)(6486002)(26005)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: v9vlvnV6a/JVYG9XUwj+A/QvAeXO8dkFYc04OD/cjdQHdLsP6jsVbFIABpBRQcPanFeFqpOeDDLGQNBqAq2TC5lZ/Ixc7hE61PVoBJqjZBgT1ArFpfb2hiD1315JC4nLipM5t8E7N34u1UQs/bDb+yNW3WX/yu9YwMxO9WEP0ktzidvadk43QXXnRm/dzS0jyhJhwxltGjrbMIfF63alZANgyt6McTdTMN9PPb1E4ktKOIAlioS/2P13EvuF8hVSDW7//3DaEzfu4DschSxG3cYZUahH2R00/jIUIOoP2CTqQSooVbWDBrecBTIySgHk/WKG/J14wFRpPObfUoWHb4mOkWZpMUxfEVWsrytAHwEOXJDHfNW623xBj6Mj36V3yXe0+4eGiTy9PNde6LmVyCAZZkZb9jFsbSij4nKkDbNgugj7Yzm6rPRunoc/HkrBnTErC1+DI1jxO2TsJdj72CWz8mERLAXl6qEiZVxaUwevRTIFHJwmj9olNMmXPQoNzlwpkIWAs1sNfGOpyP/k5mfCj7piz5CXnhgYBMuwPZiCrP6rO37Ph8hGCv9ujXdWxnI4oRitjkoN/EVUFVUFG2U8RoBQOnwpYBxW8rxQfIASkf5EQP7CRV4ssQgZgJZJ1rY0IYvdSstenJor1b3cSlW2z9HDLke2pyimHowKhSDfN0Upd07VkdpPZEwGuQJY0CaeesbfCmFJJPYTWrhY6pNWRSBJdOcdG3sdrRDji9fP97Pcyb5I1tVWtGAEUe52xNpXCd8ZwdOWeLykbIH1M0Wh6jFM8EKlYVDOrjfS7rzbqKCIyr9BOO1xF1Ddz9Y9MlescdMWVdMgBI6xzFcC5kDCftWQhjcyt06JzSuvv2ZbXOgD9JKAzU6d3VJkBYRS9xxLI84owu+nnlZl8rE0SLHU2basrc/Z3yUwAWR6IMsmuMITyvJSCrreP/1IU9RuskFbVIV2+vm3zrixP8AzSYGEIP5vil+O0g1sAdzG6tf8J1yB/hV/Mf7Yb782/7dmvXO1FEwABZPF4GHtqiuI9sNYHT+ucgiX5ed1Y4KwPDKOKrc4J2UiWMmZG8OgwY0RK3VmW5D/3TUVXqmLwUj9WtXXjnyzUomLFR3o4RrX+JjcHFp/TIitrLDi3LC6ySdo/pyGKRK9HY4MptOAt5Cznl7x9dkF2gRTeM+iFQn/bfq0peVBdZ/LuoqVm9KZfEWGo3ax3zi/m5CjzyIcgBAOyu59wkZH+b48bJc08JCgjbtzvn/cZOt6wVjEpfdHJp5iBCGX0/bzlE8P3vgMo4iei2oZIaj4/QRLFoRhqR5505uJh6AYmqzkI6praesOfgB/XZKca2Chuq0N2jYDV4p88ADfG2dOiG5D6WM4SItIobM0ZK16s0tN4jJXdemppzPDMD43BGCgxkN1D8I5gKG7UTxNn3DoBcHu2B4U0ih/EcwU1aodN0VEsHOhOBhOANE78PU5j7UgSi/9MDJzC42axhUc4eG+B6nLn0iJ67toCjxOVjv5gQjIb0NoQwQNdzynsSNhQcelh11auPrGEE6Z8R+A0NI3TOoV4VimN7BR/YjMG/oDRhXwgpBwi19q+KBv96Pq04Mx3BNpMt0qQEoQKQ== X-MS-Exchange-CrossTenant-Network-Message-Id: 7840c86e-a364-4c85-bc6a-08da558bd097 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:47:01.5860 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NHdceW/7hjxIrdskN0fKozQ8Jk1ccqm4UXrEdkyiqAhpmvo01v+ZG1N+IZQzBoElLLLE7d1usprjYqT0fG7udThgwfGeNo1BzDBaqJrdZ1s= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2789 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Recall that the Device Physical Address (DPA) space of a CXL Memory Expander is potentially partitioned into a volatile and persistent portion. A decoder maps a Host Physical Address (HPA) range to a DPA range and that translation depends on the value of all previous (lower instance number) decoders before the current one. In preparation for allowing dynamic provisioning of regions, decoders need an ABI to indicate which DPA partition a decoder targets. This ABI needs to be prepared for the possibility that some other agent committed and locked a decoder that spans the partition boundary. Add 'decoderX.Y/mode' to endpoint decoders that indicates which partition 'ram' / 'pmem' the decoder targets, or 'mixed' if the decoder currently spans the partition boundary. Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- Documentation/ABI/testing/sysfs-bus-cxl | 16 ++++++++++++++++ drivers/cxl/core/hdm.c | 10 ++++++++++ drivers/cxl/core/port.c | 20 ++++++++++++++++++++ drivers/cxl/cxl.h | 9 +++++++++ 4 files changed, 55 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-bus-cxl b/Documentation/ABI/testing/sysfs-bus-cxl index 1fd5984b6158..091459216e11 100644 --- a/Documentation/ABI/testing/sysfs-bus-cxl +++ b/Documentation/ABI/testing/sysfs-bus-cxl @@ -164,3 +164,19 @@ Description: expander memory (type-3). The 'target_type' attribute indicates the current setting which may dynamically change based on what memory regions are activated in this decode hierarchy. + + +What: /sys/bus/cxl/devices/decoderX.Y/mode +Date: May, 2022 +KernelVersion: v5.20 +Contact: linux-cxl@vger.kernel.org +Description: + (RO) When a CXL decoder is of devtype "cxl_decoder_endpoint" it + translates from a host physical address range, to a device local + address range. Device-local address ranges are further split + into a 'ram' (volatile memory) range and 'pmem' (persistent + memory) range. The 'mode' attribute emits one of 'ram', 'pmem', + 'mixed', or 'none'. The 'mixed' indication is for error cases + when a decoder straddles the volatile/persistent partition + boundary, and 'none' indicates the decoder is not actively + decoding, or no DPA allocation policy has been set. diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index daae6e533146..3f929231b822 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -204,6 +204,16 @@ static int __cxl_dpa_reserve(struct cxl_endpoint_decoder *cxled, cxled->dpa_res = res; cxled->skip = skip; + if (resource_contains(&cxlds->pmem_res, res)) + cxled->mode = CXL_DECODER_PMEM; + else if (resource_contains(&cxlds->ram_res, res)) + cxled->mode = CXL_DECODER_RAM; + else { + dev_dbg(dev, "decoder%d.%d: %pr mixed\n", port->id, + cxled->cxld.id, cxled->dpa_res); + cxled->mode = CXL_DECODER_MIXED; + } + return 0; } diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index b5f5fb9aa4b7..9d632c8c580b 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -171,6 +171,25 @@ static ssize_t target_list_show(struct device *dev, } static DEVICE_ATTR_RO(target_list); +static ssize_t mode_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct cxl_endpoint_decoder *cxled = to_cxl_endpoint_decoder(dev); + + switch (cxled->mode) { + case CXL_DECODER_RAM: + return sysfs_emit(buf, "ram\n"); + case CXL_DECODER_PMEM: + return sysfs_emit(buf, "pmem\n"); + case CXL_DECODER_NONE: + return sysfs_emit(buf, "none\n"); + case CXL_DECODER_MIXED: + default: + return sysfs_emit(buf, "mixed\n"); + } +} +static DEVICE_ATTR_RO(mode); + static struct attribute *cxl_decoder_base_attrs[] = { &dev_attr_start.attr, &dev_attr_size.attr, @@ -221,6 +240,7 @@ static const struct attribute_group *cxl_decoder_switch_attribute_groups[] = { static struct attribute *cxl_decoder_endpoint_attrs[] = { &dev_attr_target_type.attr, + &dev_attr_mode.attr, NULL, }; diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 6832d6d70548..aa223166f7ef 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -241,16 +241,25 @@ struct cxl_decoder { unsigned long flags; }; +enum cxl_decoder_mode { + CXL_DECODER_NONE, + CXL_DECODER_RAM, + CXL_DECODER_PMEM, + CXL_DECODER_MIXED, +}; + /** * struct cxl_endpoint_decoder - Endpoint / SPA to DPA decoder * @cxld: base cxl_decoder_object * @dpa_res: actively claimed DPA span of this decoder * @skip: offset into @dpa_res where @cxld.hpa_range maps + * @mode: which memory type / access-mode-partition this decoder targets */ struct cxl_endpoint_decoder { struct cxl_decoder cxld; struct resource *dpa_res; resource_size_t skip; + enum cxl_decoder_mode mode; }; /** From patchwork Fri Jun 24 02:47:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893333 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D1E4C43334 for ; Fri, 24 Jun 2022 02:47:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230151AbiFXCrn (ORCPT ); Thu, 23 Jun 2022 22:47:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230145AbiFXCrZ (ORCPT ); Thu, 23 Jun 2022 22:47:25 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E40D856F8B; Thu, 23 Jun 2022 19:47:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038844; x=1687574844; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=k577WlWGR8+tMsjmrBphLWB/BamMu7wSTNCexpx4R3k=; b=Yvx5FzFQNLjjUir5cQvAf/bZczG8+xx+ZILOnjK+QA2S7TBFog7+6ARI YJJ1P0WeY5ARVmKTnMM2g2kOUYHUrjx6pR6FhTkHkiLlCEIFBCrXW1KQ6 ZP0epbyY0IkHYemw4ObRYDJxV6cOUF6K9AeayXnkbFsQgIxRCnKYnldGM p38Q9cvHcRS30lMv871xbmdhjaovr1ql/Jvl/0nk5U6KBnf3pntOOKVmB Ops3ru2/qzR4XNTwI62mVI/CgJvcwULU8ifd3a5upVOsB+Uevxj0C8tP2 uZCwlnnYL1vge31bJKYoL81+rQITeOnn883XfmSGx1h6xSBuCpGMXXJ3B g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="261331945" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="261331945" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:47:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="834933975" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga006.fm.intel.com with ESMTP; 23 Jun 2022 19:47:23 -0700 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:47:23 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:47:23 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.45) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:47:23 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XfFb6NRtwPae/OGH+KdvvleX/rUgPvyIh4QvtPw72SjlzarUSjC62ynuoCf0njkI1APKsiDuNT8uiPX6+cPATPvCLGqXkjaFPBJ50eybd+m5wQUzUCQc+yGrTbzTVbQW6UWfa3ps7RFXicY+wXzDJMteCtYGB1FDcosN9P3HznojRZfLQ0/sakHNxwU5LifRqgU+qNAzBf3y9uaz6kMy1rB+TCDdsNnKHznV/I0O0EIRA6fd98qn5GSsqAXjbirwxgPQniqsCtwAk/P6ahWvVldrB7QYKLb16v2XES3rFtIwf0tJJouqJrQ99SiW+PSkK6jFQhgsGntK6ymPQETDjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xfWBfHXLVeiYVRrcD6JcrPyU4M9x3zVr5btJ4kG+YN0=; b=WwjOCgYEKCL4AdMsXWln1QM8yy//xWfkq6IYYdnyJHMXOZbwB1C67FLiNLIaX0GPb3Uxdjh0LWLlB5Wj8PXFBXfQ0bueTvQQkb2JblLAyBRtLAE03qkzYYdrfBgKk9arqu0WcIjSSEbpbhpuw97AosOT7NqZ1RVkSieZK6+FrJZZ/Yoj/URI+a2jpNQo8WtaR5QSuYwC5hV5UfTOSJlRZoAancLohRjZD05ujo2zDfNqCiB4RZYXdZ7GNOuYnQHduU9fyNr0OhGLtouHqMdnnDqtY1KBHzKap45KsZszIxhy56sr6IFUZkaWakQdr2cygqhV2WyGE10G81I/6hSGgA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BYAPR11MB2789.namprd11.prod.outlook.com (2603:10b6:a02:cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Fri, 24 Jun 2022 02:47:21 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:47:21 +0000 Date: Thu, 23 Jun 2022 19:47:07 -0700 From: Dan Williams To: CC: , , , , Subject: [PATCH 17/46] cxl/hdm: Track next decoder to allocate Message-ID: <165603882752.551046.12620934370518380800.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MWHPR13CA0032.namprd13.prod.outlook.com (2603:10b6:300:95::18) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 94ae1edc-75dc-47e3-694a-08da558bd531 X-MS-TrafficTypeDiagnostic: BYAPR11MB2789:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: USuMyRZSscnMNciT619PK9TmVDyCxN+1JIu/gETYCzqO1t5uycsBKgqexDMfJrvoBlMge2+eJwoxd9k/ap9MhFWT8JfRBe+niH66nl83CNX+NBl3y+9PN6rYZvfU0UoVMDrhu4GsXJaeM2cp9TgThinSa4+tdJNZvir9O8nfImMZe+8k8OVwuj6bv+Kq1xfhfa4jtZ101dhp6bl0d9fh8zmXUg0THOZN5oVtsQJGSdRiwyPTAnKJIYBW7mHcSgWaYTVr1HDuUkczXpjsJtRoUXJ0vcYtdpqhTbMrwtXDCsE8rhg1E5p8u/b0amYMQEE17SKMYH2H7Q1mrK1C3oKofc2H2/5Mwmrhs8xZHg//jid+ISWqJ/7WynkJIa6fl0CFAvSeoDKISohQGZivlHsQIZJNChX5lB9CTLJzZ4Ff5Q2ODsqbimvn4UW1O0vMXxq4lwYHNTbmBSt6tnbBwGObm2Cg35MTLggqMEoQjnDKtrwhSMGNriwmE8xZT65ep1rBB/R3S4mlFXLmkt8nxodyh/xudqyZpNmfUm31fTVqKLwndfi9jdVV8NzwQk1YBGrVN3xYAMmjXOFOT0nhe/V28iwmOW+fLTZs2ZQbs9jktvEenBXxjr74I5aTFHsjdGC2ZjfZJa8qLBGwvhFUObK+Ez9AYdSyn8zRqP9DEy2pu+fOGTxJm0UfacylFkaSgEj6kwXQhrwgceWF2RO0IW+nMcUw1i60ku9H3ZROVo28KjzjooOcwcJASkDrZrJ13CDO X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(366004)(136003)(39860400002)(396003)(376002)(346002)(8676002)(6506007)(66476007)(66556008)(6666004)(9686003)(82960400001)(33716001)(4326008)(38100700002)(6512007)(66946007)(41300700001)(478600001)(316002)(83380400001)(8936002)(86362001)(103116003)(186003)(2906002)(6916009)(6486002)(26005)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Y/v1uPS1W9ZjIhwWnrwJXkPzsJQmaZenYxHp91IXJN6HFYv6bX74KlZ62HImTvMB3MO7zOXqTaNT/uqUI6F7BnHJAA8HHFmUeElSH5kLGv0ylASSivTC4lmZe/H9WUQcA6z9w5atxNbggWtV0G3fS1u5cGKIvsEPypFeyFyCFNtIsXCEZWP4ZJZoFMd4knuyHFk/6xziDB5juyNTIgnNjJBkClo0c9nlDskaV7rDjDGC92XJypv5ytsuQ8f2A9ydO2ic8+AEkfm7E/Yju7vUpceW1XdhmPXaSDU045mqHpGVofdPI6qS6XHC2ktDlkAMhtAGFQVFtrjSAJfiheofj1WVHetzbZxLk82JiW/8bJDc8MuAPREM0WLyENplEktKcLdzW/gsIPxDmTzkTKuCwt4ocbpuCsfNVmxm/QY9qIoegu7Ok1O2eLSZlagDRXi9chfLTXZTe9Y4StGrSviKGo7U3O/btfzELgdmwZjA5tSdscRWt5HCALArJrFdGOTQVj9EIbiZbJ4BTCA/R/KgWeVf8pFyOFiLfxEhLQOacrjvaG+aFjwD6RRgaSsJhs6Nvf0+1n6DgNaSvvA61COLouZGddsVLaaOJmtD48URGOqs+qr0vrTDsRb4mDoUAaluVHZvXwWqN8A02JimcQ/d5WmBVwOTrwjAseriFytWu6NkguKQfSNVQJt2SrJu77JqH3l9iJ/YjTA19EvcjHt5YvORHW0aOhRF222tQijNdYsju3UX77m9DRwbzRiC7vT/ORLB//moZqJSXuRlj4e8psKcXYTWOn1O4wwlZxXaZNfeIDq/L5kHq0is+oOqYP5UrDC5j5AbLSNj3E208pnqpkRhOYILJ20fsIRyHxeBGuZGZNUjMhcoHdVGq6BUa+2fWdXXqaxzmJ9Cn7TsyMVXP69AJDLSM2xnRfWNHvNwnOigZdYFjUIiM4AEQKyJzfhUZ6kH+fabjqA7s5RzLgFFWyQ8lzvn3pJYlM5/XcGStkO5gwV1JwiTW6+FKi5Bp1NG0p75urmMeUedUEUze1cfPs05ksgCIq4X2i7MbVDQAJzxk5Z8wvK+OyEu8XNQptsRHBneoP1gpnCsc36VE0NPuATcVcY3L16Bt6tgY6vE0sVw94RkNPelnP5U+/esL++YrO3QYUTKArCafW/X3v3FGKKNMGkwGLTje+2cUllritIMTif5nwHOFYNR95L7+qe2hWfSKc91+/Y1Fwd0Pf+Soq7krUyec71kmt/dHpmBc3ty1CrlPN7Af2OY85gcYpgG1ig/vAU22DCGPoHwrDV1gajx7DOv/y9ULMiaYygCIoHSWxzobAV8sisSJAreUR0F/GBzEw9BACzszMEdKNM4fIP15VWdqjr+YmigeZHjDhGkN9cLS+mkZl5g549MnkMqu734Y/85vMCWfDyPZArGT1rOia7nFb8nGp91Sy7p9E0YNvJm8WFzC8lV7OtLg1wyPlTiRWzYKuV3SULvmHDpT/DexBJJo+HLOwbMfs9eIZf3eKdVklkD3EBlZdIEkPT28CJAYsxF9tiniVFzJ1AomdGzk0wTx2Du9piB8yLMWYgKmepmdRjl1ijKKOVPWRDIkfFwXxelHccyPDh7Bm6U8w== X-MS-Exchange-CrossTenant-Network-Message-Id: 94ae1edc-75dc-47e3-694a-08da558bd531 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:47:09.3196 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: maNxTkRUAe4X/ZVrFUL3R96Un/byV98XSt3zkX+jJBD41TXoMu4MiMzs4sGQ+8DqbX04zSflHWQJNc0+9YJvGx9YlGrl1WvV6Jc7VVJLrEM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2789 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The CXL specification enforces that endpoint decoders are committed in hw instance id order. In preparation for adding dynamic DPA allocation, record the hw instance id in endpoint decoders, and enforce allocations to occur in hw instance id order. Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- drivers/cxl/core/hdm.c | 14 ++++++++++++++ drivers/cxl/core/port.c | 1 + drivers/cxl/cxl.h | 2 ++ 3 files changed, 17 insertions(+) diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index 3f929231b822..8805afe63ebf 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -153,6 +153,7 @@ static void __cxl_dpa_release(struct cxl_endpoint_decoder *cxled, bool remove_ac cxled->skip = 0; __release_region(&cxlds->dpa_res, res->start, resource_size(res)); cxled->dpa_res = NULL; + port->dpa_end--; } static void cxl_dpa_release(void *cxled) @@ -183,6 +184,18 @@ static int __cxl_dpa_reserve(struct cxl_endpoint_decoder *cxled, return -EBUSY; } + if (port->dpa_end + 1 != cxled->cxld.id) { + /* + * Assumes alloc and commit order is always in hardware instance + * order per expectations from 8.2.5.12.20 Committing Decoder + * Programming that enforce decoder[m] committed before + * decoder[m+1] commit start. + */ + dev_dbg(dev, "decoder%d.%d: expected decoder%d.%d\n", port->id, + cxled->cxld.id, port->id, port->dpa_end + 1); + return -EBUSY; + } + if (skip) { res = __request_region(&cxlds->dpa_res, base - skip, skip, dev_name(dev), 0); @@ -213,6 +226,7 @@ static int __cxl_dpa_reserve(struct cxl_endpoint_decoder *cxled, cxled->cxld.id, cxled->dpa_res); cxled->mode = CXL_DECODER_MIXED; } + port->dpa_end++; return 0; } diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 9d632c8c580b..54bf032cbcb7 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -485,6 +485,7 @@ static struct cxl_port *cxl_port_alloc(struct device *uport, port->uport = uport; port->component_reg_phys = component_reg_phys; ida_init(&port->decoder_ida); + port->dpa_end = -1; INIT_LIST_HEAD(&port->dports); INIT_LIST_HEAD(&port->endpoints); diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index aa223166f7ef..d8edbdaa6208 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -326,6 +326,7 @@ struct cxl_nvdimm { * @dports: cxl_dport instances referenced by decoders * @endpoints: cxl_ep instances, endpoints that are a descendant of this port * @decoder_ida: allocator for decoder ids + * @dpa_end: cursor to track highest allocated decoder for allocation ordering * @component_reg_phys: component register capability base address (optional) * @dead: last ep has been removed, force port re-creation * @depth: How deep this port is relative to the root. depth 0 is the root. @@ -337,6 +338,7 @@ struct cxl_port { struct list_head dports; struct list_head endpoints; struct ida decoder_ida; + int dpa_end; resource_size_t component_reg_phys; bool dead; unsigned int depth; From patchwork Fri Jun 24 02:47:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893334 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96355C433EF for ; Fri, 24 Jun 2022 02:47:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230145AbiFXCro (ORCPT ); Thu, 23 Jun 2022 22:47:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229559AbiFXCr2 (ORCPT ); Thu, 23 Jun 2022 22:47:28 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4914B56F8B; Thu, 23 Jun 2022 19:47:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038847; x=1687574847; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=hZDzbqdvdL0Lsair8D6fHdnqjSy4yrUja0LuPqwSDB4=; b=lzDG+/XQ5DVrkE0R8QnGY0hlW9iR2zdPtrvGFq7mGLSJxUuqQg7nNbUO Dp1DD6IVt4szptsXoDtoYG7+p3CsjX+Cjrv1bX+gtUt6y969Rp46ORLri mHiKyoKRJUSg52EgGlOteJfbR8tH1EN8vfuStewxK+OCtfiyKu8QjCq1O +CBlsii/KPpIwPHHTeY/DtUWF5hokzLFVh6VdAW2epv9SlT6rKG1uZguf JAAWDAkKCO5nGyqF23XCc43p7u/egJ8nKnFlMC1xY247197XSQAyukv/l 4iCS3wdkG6ZLqsxI3dLftYRdjJcNOF5yOzkM+vJnAqQQx+xi9P0W+DPV+ w==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="261331954" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="261331954" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:47:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="834933986" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by fmsmga006.fm.intel.com with ESMTP; 23 Jun 2022 19:47:26 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX606.amr.corp.intel.com (10.22.229.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:47:26 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:47:26 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.47) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:47:26 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LHVfm674r11T17iUG2ZtMvn6+0cX9gri7Hv7iKkiglnKxXDNxHI3R5f8qTFS7cJNB9sXoUm/o0E6lLdbf/LQ0QEhWruIYlP588L/TMOyKVaV5WhDRSwtxS8LA17fMhcalBoEVjnTAEsDFAtY2D8g3YcshgRFzIeCJAwDKua1RBMLSwypcj7nUGvo/Ul8fJeTMKypWvPnl2BmwsJZsTjaFpdJUEtwDc0LTrjRNHPpNnprMexARACnSMFsX3zEJ0KfHdl5qfAXW6/tHS6ImTOQ+S4jEEYTHoTxT1ZesCyMcnOhxFMdbICm48ePS+kP7E352R60ZZ8s1tQMI/NgJ8DCNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=FYEsxWpRW4rAw7Q7uQ++hy5O504P+o8Td4t+Uu2rV8A=; b=F7WEe0CDJyucS3sWsegIKj9vUt4g/HP8e9s7ZJJ+wplN4Lnoej2rG0Pv80LRNDFFEpigPRAoWcTyMLxnT2muXs/3Bf0aBlLCeBtaDZSAtniObeAQbp4iiDOYbo4BUPWoVHdKOPbyV+4klXoHUapIcwQ9wcIFyCbbfaW0YcC6roKQA/L9sywReDhcgBbm6KAPjZ+aMnPNvVJhRDuG1KlZKUqFABcAar6rjaG2rtKM8Zx9kujDsUNUTnN0zCsLgs3o/ih0E5qlPQQqCZpb1+m8wmFPj5bkqAW352zypuumJ5XZnIwoiu3WCA70L6Rh4aJ+RHoQAIQEXRiLbcUfCmIRtQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BYAPR11MB2789.namprd11.prod.outlook.com (2603:10b6:a02:cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Fri, 24 Jun 2022 02:47:24 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:47:24 +0000 Date: Thu, 23 Jun 2022 19:47:18 -0700 From: Dan Williams To: CC: , , , , Subject: [PATCH 18/46] cxl/hdm: Add support for allocating DPA to an endpoint decoder Message-ID: <165603883814.551046.17226119386543525679.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MWHPR1701CA0013.namprd17.prod.outlook.com (2603:10b6:301:14::23) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 82b96727-8f4c-4f2b-5798-08da558bdb9e X-MS-TrafficTypeDiagnostic: BYAPR11MB2789:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fu/+kI1RcnuVEJoMRrvb/ErhL/XUFHgtmTXEvYjKWaQlVJHU05KZaRlpC3qvQ6b3vZ3aAQ7WrxtdLuplPBZPG5/4JMwuW7907QwJKHCGAMH8qW5DfqyYhhSiN5Qcf2fYJvUHK/39YEDFqbt/bMx9sPCL6mmm39QVPdCDUg9llnJKKo8gi+99v8dA+4xces7/VtOVi1ZrG0ozH2U/nEh9P9G3Sck5vA78E7z+BKVxbslfSdSkxENsr2DhrFhMypWutq4I3XW02Hd8CeUOS6+BUaU+BrtyGavQy7f9yBlQKWChRjzseJI8SS1uSsSM81L2KFbOv+JRpZL3oe5j/IIQ42NZg2P3w8ImZVtaG7RdhwaWh0cKH4iIOVJb3+siHDDbGwyxLfJEPWhNxxsz3J/t8DUOP9U3pOWeoIHxsVrAklwR3gou+jB4JJbebhleY3G9W8qXKxJ5xZDguaAfciK2yOfTyG8VqmY81ZCamZE6nOwQMp5Qc58tu5Vn+rMHMHwYejBoqdP4VPNW8L0Fmm0X0zij88H5na7bjNd3XDhnA5Ta///Hp641VCWZez+ZRJ5qMIbmI2Nh/IJo4kEmJTFx03iaqhgmKQCT0tB0EVE0k7AYmGaWP8DAdkwNXb0V5b+ZGgMZnqQ3kOCb1OhcMQkTJpnj+Lo2w7DhOSrp8yZYU4QdWfEgIrHs3kKcGWiat3vb5ifrqI0c1lEnt5BvCdmJ36r1/ljnb6rMQX8GgUFyh/yFPtfnov/iUf41E8Ioqa1c X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(366004)(136003)(39860400002)(396003)(376002)(346002)(8676002)(6506007)(66476007)(66556008)(6666004)(9686003)(82960400001)(33716001)(4326008)(38100700002)(6512007)(66946007)(41300700001)(30864003)(478600001)(316002)(83380400001)(8936002)(86362001)(103116003)(186003)(2906002)(6916009)(6486002)(26005)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: W7xXCLXLp3ZjB6E+5tGLIszE+CA/udL8rwgzf7oDUDH4N7UexDmKAhOmTCb2Zt4WTfV4d4qJmFFIDj/reWEEVi0P3QBPIgYttTDnRhnpsgbzWPKpQF637iOlmKoOshr4jTnuKNNq+zQ+ml+80mdID2t2Fst4UmrVeaTCdZ4ggId9/zkdi+gQXZJ9W+jer5wrAFlAiuCQrARlsuiBcb+y4GIpswzXtS4pY5KPZurF6/MYQO0u3fGJM/HPwKMW1LPjt1a9rLmFS049NLIjGEG9gIr2i1lhafWsYUBh2PE43usWZfvr+bbHysPzc3jp+9/MmJyxhFHVAe4ahobLe5iWFkJQzeUaKqaIRBLHTm1F+lKcvjys3jDcLqIWUT8QDJVFzC3ESQ5yqk6guIGykCbEq9UxQuKD0abaXcBNOEv7H3G4AtgiIER1JrXzjzmAuAfgYXJR16Rni0GMfIFEt7TVXa8i66XYjZbVKa3QkLLCJZD+Q97y3qqkUULn9Ggj9CizMyTHuPd7NTUWK3o0LzYxZ9M1+XesBRIT6BTFFuLydsmRhlc1wPL+tF9fcT3pJYSnCWknQIbJx1DstUbm7r4uc3n+UPJsgHPAqzR22ENBDwE7n7Y3Pzmlxz03I8PmFgA7H9o4V78+3Z8BXwLGq9efX1dCeFeH2R2bSFl41Xl84gXwx34C3IpUN4+Cn6ZcpuLyOadtXRIxafLZXjVoeXrxhxzzMkuL6QQ6VVpAvh+3oq9QVt2Mu/4Wl2pDA7/j9zLs+I1WEPVU4CTRzTQgvKuad1rY5ahjQALesLat/tHmKml7zbnXHLYmjLtQctG1LnGnS7/gdZXY9/q/0XZsNABwZ/rs80rmblPbPiNiEi/ZDwTr0E5+s1tNqm49lKBWvja/XOF5V2FqWNJRa/vOhkpJU0VuxExhKGOcY85BH87L+mZwsRURxXL+dNHJ2+GD4KM7Pb3Pjus9ss1r2fIM3TN4PIWStmaA89JuwKKlaiphQ4iS2IkaKQH5JLIArltnGTyT2ZZdIv7rAePPJV25PQnxUPXKwf4yU/EklAl7D0e/bSlnTE3PH1p7j+Anl4zQgTyArSZl9EvHpX0ZTV5+hYSmdYk15aWJEqtvQJeRBg1pyZGdjedFm422IjhNMy9R9ZO7CTt9Qk+wKxRroewGvpNaTKI+0ReIJN19KQRO3v5Rpzrqpljd3vlNK95OZQXldbC59xoHOsokSdqviPe8gUyCsIKXq17x09NBIedE1xdocYOj9flCxBoIulBvCp4iah46OA+oeOVEIMso3ynbJYIGnfYPnIJMVgD1WcT6TMiC/+ESSIJm6pgx7Q9C2vCnXcr5IvS40In0DdlK35yxlw+xuchMDxBYn8j1gy768dgF0cakje49hr/dGaRo/5YCuYTHFDxmguUi2wzg594SBNDAvFNGRkHFKf220lw2RbLzZrW/bI8CjKr1RBIZBp+NS9WhrMbTy7x3aPZiBXmdHFXX1DINdyELZhSzs1vVlf9qxCwNz4aQQJNmo9bl7orQhhjdiJpyoUsGUkNDml2Ueh6aC4g1AvUWxwStQr0mHQs6K72U7RGJwljkhxSi4x/1zZDwEz+kePkoSCf65OR+s4PSSw== X-MS-Exchange-CrossTenant-Network-Message-Id: 82b96727-8f4c-4f2b-5798-08da558bdb9e X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:47:20.1155 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: a4P6+eJKn9b9gKK+73Yt+Z756PZGo+UFEG61HMu8dOWtmdbRl7UuPvTh7wpvvsFOZs5sDTQSYQr+Tv1pbMf8/IQ4yqJ/Sr0gWfhosF7P08w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2789 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The region provisioning flow will roughly follow a sequence of: 1/ Allocate DPA to a set of decoders 2/ Allocate HPA to a region 3/ Associate decoders with a region and validate that the DPA allocations and topologies match the parameters of the region. For now, this change (step 1) arranges for DPA capacity to be allocated and deleted from non-committed decoders based on the decoder's mode / partition selection. Capacity is allocated from the lowest DPA in the partition and any 'pmem' allocation blocks out all remaining ram capacity in its 'skip' setting. DPA allocations are enforced in decoder instance order. I.e. decoder N + 1 always starts at a higher DPA than instance N, and deleting allocations must proceed from the highest-instance allocated decoder to the lowest. Signed-off-by: Dan Williams --- Documentation/ABI/testing/sysfs-bus-cxl | 37 +++++++ drivers/cxl/core/core.h | 7 + drivers/cxl/core/hdm.c | 160 +++++++++++++++++++++++++++++++ drivers/cxl/core/port.c | 73 ++++++++++++++ 4 files changed, 275 insertions(+), 2 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-bus-cxl b/Documentation/ABI/testing/sysfs-bus-cxl index 091459216e11..85844f9bc00b 100644 --- a/Documentation/ABI/testing/sysfs-bus-cxl +++ b/Documentation/ABI/testing/sysfs-bus-cxl @@ -171,7 +171,7 @@ Date: May, 2022 KernelVersion: v5.20 Contact: linux-cxl@vger.kernel.org Description: - (RO) When a CXL decoder is of devtype "cxl_decoder_endpoint" it + (RW) When a CXL decoder is of devtype "cxl_decoder_endpoint" it translates from a host physical address range, to a device local address range. Device-local address ranges are further split into a 'ram' (volatile memory) range and 'pmem' (persistent @@ -180,3 +180,38 @@ Description: when a decoder straddles the volatile/persistent partition boundary, and 'none' indicates the decoder is not actively decoding, or no DPA allocation policy has been set. + + 'mode' can be written, when the decoder is in the 'disabled' + state, with either 'ram' or 'pmem' to set the boundaries for the + next allocation. + + +What: /sys/bus/cxl/devices/decoderX.Y/dpa_resource +Date: May, 2022 +KernelVersion: v5.20 +Contact: linux-cxl@vger.kernel.org +Description: + (RO) When a CXL decoder is of devtype "cxl_decoder_endpoint", + and its 'dpa_size' attribute is non-zero, this attribute + indicates the device physical address (DPA) base address of the + allocation. + + +What: /sys/bus/cxl/devices/decoderX.Y/dpa_size +Date: May, 2022 +KernelVersion: v5.20 +Contact: linux-cxl@vger.kernel.org +Description: + (RW) When a CXL decoder is of devtype "cxl_decoder_endpoint" it + translates from a host physical address range, to a device local + address range. The range, base address plus length in bytes, of + DPA allocated to this decoder is conveyed in these 2 attributes. + Allocations can be mutated as long as the decoder is in the + disabled state. A write to 'size' releases the previous DPA + allocation and then attempts to allocate from the free capacity + in the device partition referred to by 'decoderX.Y/mode'. + Allocate and free requests can only be performed on the highest + instance number disabled decoder with non-zero size. I.e. + allocations are enforced to occur in increasing 'decoderX.Y/id' + order and frees are enforced to occur in decreasing + 'decoderX.Y/id' order. diff --git a/drivers/cxl/core/core.h b/drivers/cxl/core/core.h index 1a50c0fc399c..47cf0c286fc3 100644 --- a/drivers/cxl/core/core.h +++ b/drivers/cxl/core/core.h @@ -17,6 +17,13 @@ int cxl_send_cmd(struct cxl_memdev *cxlmd, struct cxl_send_command __user *s); void __iomem *devm_cxl_iomap_block(struct device *dev, resource_size_t addr, resource_size_t length); +int cxl_dpa_set_mode(struct cxl_endpoint_decoder *cxled, + enum cxl_decoder_mode mode); +int cxl_dpa_alloc(struct cxl_endpoint_decoder *cxled, unsigned long long size); +int cxl_dpa_free(struct cxl_endpoint_decoder *cxled); +resource_size_t cxl_dpa_size(struct cxl_endpoint_decoder *cxled); +resource_size_t cxl_dpa_resource(struct cxl_endpoint_decoder *cxled); + int cxl_memdev_init(void); void cxl_memdev_exit(void); void cxl_mbox_init(void); diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index 8805afe63ebf..ceb4c28abc1b 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -248,6 +248,166 @@ static int cxl_dpa_reserve(struct cxl_endpoint_decoder *cxled, return devm_add_action_or_reset(&port->dev, cxl_dpa_release, cxled); } +resource_size_t cxl_dpa_size(struct cxl_endpoint_decoder *cxled) +{ + resource_size_t size = 0; + + down_read(&cxl_dpa_rwsem); + if (cxled->dpa_res) + size = resource_size(cxled->dpa_res); + up_read(&cxl_dpa_rwsem); + + return size; +} + +resource_size_t cxl_dpa_resource(struct cxl_endpoint_decoder *cxled) +{ + resource_size_t base = -1; + + down_read(&cxl_dpa_rwsem); + if (cxled->dpa_res) + base = cxled->dpa_res->start; + up_read(&cxl_dpa_rwsem); + + return base; +} + +int cxl_dpa_free(struct cxl_endpoint_decoder *cxled) +{ + int rc = -EBUSY; + struct device *dev = &cxled->cxld.dev; + struct cxl_port *port = to_cxl_port(dev->parent); + + down_write(&cxl_dpa_rwsem); + if (!cxled->dpa_res) { + rc = 0; + goto out; + } + if (cxled->cxld.flags & CXL_DECODER_F_ENABLE) { + dev_dbg(dev, "decoder enabled\n"); + goto out; + } + if (cxled->cxld.id != port->dpa_end) { + dev_dbg(dev, "expected decoder%d.%d\n", port->id, + port->dpa_end); + goto out; + } + __cxl_dpa_release(cxled, true); + rc = 0; +out: + up_write(&cxl_dpa_rwsem); + return rc; +} + +int cxl_dpa_set_mode(struct cxl_endpoint_decoder *cxled, + enum cxl_decoder_mode mode) +{ + struct cxl_memdev *cxlmd = cxled_to_memdev(cxled); + struct cxl_dev_state *cxlds = cxlmd->cxlds; + struct device *dev = &cxled->cxld.dev; + int rc = -EBUSY; + + switch (mode) { + case CXL_DECODER_RAM: + case CXL_DECODER_PMEM: + break; + default: + dev_dbg(dev, "unsupported mode: %d\n", mode); + return -EINVAL; + } + + down_write(&cxl_dpa_rwsem); + if (cxled->cxld.flags & CXL_DECODER_F_ENABLE) + goto out; + /* + * Only allow modes that are supported by the current partition + * configuration + */ + rc = -ENXIO; + if (mode == CXL_DECODER_PMEM && !resource_size(&cxlds->pmem_res)) { + dev_dbg(dev, "no available pmem capacity\n"); + goto out; + } + if (mode == CXL_DECODER_RAM && !resource_size(&cxlds->ram_res)) { + dev_dbg(dev, "no available ram capacity\n"); + goto out; + } + + cxled->mode = mode; + rc = 0; +out: + up_write(&cxl_dpa_rwsem); + + return rc; +} + +int cxl_dpa_alloc(struct cxl_endpoint_decoder *cxled, unsigned long long size) +{ + struct cxl_memdev *cxlmd = cxled_to_memdev(cxled); + resource_size_t free_ram_start, free_pmem_start; + struct cxl_port *port = cxled_to_port(cxled); + struct cxl_dev_state *cxlds = cxlmd->cxlds; + struct device *dev = &cxled->cxld.dev; + resource_size_t start, avail, skip; + struct resource *p, *last; + int rc = -EBUSY; + + down_write(&cxl_dpa_rwsem); + if (cxled->cxld.flags & CXL_DECODER_F_ENABLE) { + dev_dbg(dev, "decoder enabled\n"); + goto out; + } + + for (p = cxlds->ram_res.child, last = NULL; p; p = p->sibling) + last = p; + if (last) + free_ram_start = last->end + 1; + else + free_ram_start = cxlds->ram_res.start; + + for (p = cxlds->pmem_res.child, last = NULL; p; p = p->sibling) + last = p; + if (last) + free_pmem_start = last->end + 1; + else + free_pmem_start = cxlds->pmem_res.start; + + if (cxled->mode == CXL_DECODER_RAM) { + start = free_ram_start; + avail = cxlds->ram_res.end - start + 1; + skip = 0; + } else if (cxled->mode == CXL_DECODER_PMEM) { + resource_size_t skip_start, skip_end; + + start = free_pmem_start; + avail = cxlds->pmem_res.end - start + 1; + skip_start = free_ram_start; + skip_end = start - 1; + skip = skip_end - skip_start + 1; + } else { + dev_dbg(dev, "mode not set\n"); + rc = -EINVAL; + goto out; + } + + if (size > avail) { + dev_dbg(dev, "%pa exceeds available %s capacity: %pa\n", &size, + cxled->mode == CXL_DECODER_RAM ? "ram" : "pmem", + &avail); + rc = -ENOSPC; + goto out; + } + + rc = __cxl_dpa_reserve(cxled, start, size, skip); +out: + up_write(&cxl_dpa_rwsem); + + if (rc) + return rc; + + return devm_add_action_or_reset(&port->dev, cxl_dpa_release, cxled); +} + static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, int *target_map, void __iomem *hdm, int which, u64 *dpa_base) diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 54bf032cbcb7..08851357b364 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -188,7 +188,76 @@ static ssize_t mode_show(struct device *dev, struct device_attribute *attr, return sysfs_emit(buf, "mixed\n"); } } -static DEVICE_ATTR_RO(mode); + +static ssize_t mode_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t len) +{ + struct cxl_endpoint_decoder *cxled = to_cxl_endpoint_decoder(dev); + enum cxl_decoder_mode mode; + ssize_t rc; + + if (sysfs_streq(buf, "pmem")) + mode = CXL_DECODER_PMEM; + else if (sysfs_streq(buf, "ram")) + mode = CXL_DECODER_RAM; + else + return -EINVAL; + + rc = cxl_dpa_set_mode(cxled, mode); + if (rc) + return rc; + + return len; +} +static DEVICE_ATTR_RW(mode); + +static ssize_t dpa_resource_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct cxl_endpoint_decoder *cxled = to_cxl_endpoint_decoder(dev); + u64 base = cxl_dpa_resource(cxled); + + return sysfs_emit(buf, "%#llx\n", base); +} +static DEVICE_ATTR_RO(dpa_resource); + +static ssize_t dpa_size_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct cxl_endpoint_decoder *cxled = to_cxl_endpoint_decoder(dev); + resource_size_t size = cxl_dpa_size(cxled); + + return sysfs_emit(buf, "%pa\n", &size); +} + +static ssize_t dpa_size_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t len) +{ + struct cxl_endpoint_decoder *cxled = to_cxl_endpoint_decoder(dev); + unsigned long long size; + ssize_t rc; + + rc = kstrtoull(buf, 0, &size); + if (rc) + return rc; + + if (!IS_ALIGNED(size, SZ_256M)) + return -EINVAL; + + rc = cxl_dpa_free(cxled); + if (rc) + return rc; + + if (size == 0) + return len; + + rc = cxl_dpa_alloc(cxled, size); + if (rc) + return rc; + + return len; +} +static DEVICE_ATTR_RW(dpa_size); static struct attribute *cxl_decoder_base_attrs[] = { &dev_attr_start.attr, @@ -241,6 +310,8 @@ static const struct attribute_group *cxl_decoder_switch_attribute_groups[] = { static struct attribute *cxl_decoder_endpoint_attrs[] = { &dev_attr_target_type.attr, &dev_attr_mode.attr, + &dev_attr_dpa_size.attr, + &dev_attr_dpa_resource.attr, NULL, }; From patchwork Fri Jun 24 02:47:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893335 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30D68CCA47C for ; Fri, 24 Jun 2022 02:47:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230253AbiFXCrq (ORCPT ); Thu, 23 Jun 2022 22:47:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230372AbiFXCrl (ORCPT ); Thu, 23 Jun 2022 22:47:41 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB1C556F8B; Thu, 23 Jun 2022 19:47:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038856; x=1687574856; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=Uu69u4RfN/zQjuOLELQ9sAdylGk0iYV+1lZ0Twv6U5o=; b=DdiN44zJttGXFiUjEjNW7KqRMI8jL3wmn2wNY+K1nDid7wnWdDLvrk/c 4J44sVx55U08VKZ7eKdX9wJqM67OZZg++VQKS6dRENRkeTfjCoV5Izhry 3+VycNvq1wkau7GqsCMbkObJJdhYzNgGl4vvCWtT/CZ/fbp0SGTfyZo9x Fm6VbvMSFyPWGKlG9kXJUEgLvvm6BeC5Wv69+RQaBMhRXVk85PS8AkxHH n+b8cAgUnbkpKLmpFy1E78AqAn3H2FZQGouINOlZ4zb/XFxpTZDXBTNLV r/0K7hD3wKpjcBiSLU6hXc4iNBDzK7FeMLlT2U4PpUXNz7eLAs6glwUrl Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="344898568" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="344898568" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:47:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="834934021" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by fmsmga006.fm.intel.com with ESMTP; 23 Jun 2022 19:47:35 -0700 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX606.amr.corp.intel.com (10.22.229.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:47:35 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:47:35 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.47) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:47:35 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k8uwEs0xiEJiznCiGHNlO4SVLbJZkX5XhLMM4vyl11pMVLuwFb9k1xU4drM0umzZsIoN55yLDxBMqG9H386afZGJ6Djm8fti3w94ZpvqFBlM6p+pa5cj9CwpI3R3USrTvgjbJGHwLnMwy2v2DKzGM8dBvBE4yVjhPuBd27nt8uzCu5vnReizVR+1YvqE7w0PPZapzAcApqXgJPsxQqAM0EGi+N60PdSr4p8v8F8QGGQQg48OqRHP138+PDHE0w51K7NO2RAWeaC5xb2AEGMYA66pEZlyy1JISvPehr3aiW0G2C1sCnp2aHZOCOOTiiNsWBtl4elQBUdGkUR70IXRog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xWOFkoDpLa2Rar650FOvtRrs5FEMPCUvgHzxKtb0a20=; b=bIAI1Gv8IO5TK4uXIsfJOquChzY8E9tkPlrTnoiD0wvRfT0l77SU27PtOjf32Lw3kwpgcX473jzUihdeZklcz7VrS7Sqmm10M9b503cilh3bnyg935Cv9giSNRZYHozXtlkAa2iBVHZByxSLTmm/4dSee/39HD7o5YqXWUIxwtiQwD05cVsoq3WQf0Yvz/qrI5L26vq7DOSgOqUs/RMSEHnbfBEo0yQvK3Os3pB2ebCdovsPblWYcAAZF3jxXR+oY8290UE+2hQYEE10WnZeByilHqO5XQldjaWxQHyCXziaoyK9Mb1x7pGYdgoN73Jg+W+rN0wkSMqh2yWeUuJTtQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BYAPR11MB2789.namprd11.prod.outlook.com (2603:10b6:a02:cc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18; Fri, 24 Jun 2022 02:47:33 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:47:33 +0000 Date: Thu, 23 Jun 2022 19:47:26 -0700 From: Dan Williams To: CC: , , , , Subject: [PATCH 19/46] cxl/debug: Move debugfs init to cxl_core_init() Message-ID: <165603884654.551046.4962104601691723080.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: CO2PR07CA0078.namprd07.prod.outlook.com (2603:10b6:100::46) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 82d84f33-71b8-478c-2922-08da558be05e X-MS-TrafficTypeDiagnostic: BYAPR11MB2789:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WqSIwWv77C7IaFHmobYc0OXvm0So1OGu98M0LtVvTbGBNWU9SE5DwZo8d7SERWwxybMbh5XL4FLxYKuAX2nIyn2UtSow3AqxSzFF2sDZfoLNaoQmhGkCc4QMgTnkyjTQO6499KbPBmncB9CLe+2FLoTqFVycVpxEBaLu3MUNJyygSJUUZ+XgtKy4b1Ghw7y5WPIDqCs+CwhD7lmIzwwnX77fapG3uS26UIRV31y3GmZ3LMrsy5BibQ1x5B+DQPHXt1W1AwmgJxgtuIxjseeTl7UEBXvImBNxr33YhuP16+P6buJI4413TM5XDa6qeo8H3S7tjifplVgVW12Kv7qs4/tD/k/RlJCU3kAI0SeQEuHH451IlqHoUuqiocyPOzLUGcZdW0xCesmNV4pevXzlLeEfRtrjKfAFUn6x755mEcrSb7vwTNCJ/nNko+69/ofFxDJo1bLkRJKIQdB7cRUStpuNkpo7RFGIDfoRVsBEbEcP4STBsQjS1mHpQB8jFHIatfekT1swGQkX0ykYHghfskqf2yuX4X1F3mJweWg+35MPBWMNSzd0rsl7KPTXLldclJmWoZs4U9Qv3gcGrxDvXcKK7taZVkJblhvf6AYOV0fgb58OSrDjLwWebgg+Vbmn6raTTQC/fydhK68b23WNRFu52lr489Hc5nrjjywaLWOBmubfEqEByDYdcHQXYf6/2OcFSEyjWqy+eI8gDvK0MiZH8QMpxWT5wI1cXvkdxzMRB28Zit38PuwGKUmEg7K/ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(366004)(136003)(39860400002)(396003)(376002)(346002)(8676002)(6506007)(66476007)(66556008)(6666004)(9686003)(82960400001)(33716001)(4326008)(38100700002)(6512007)(66946007)(41300700001)(478600001)(316002)(83380400001)(8936002)(86362001)(103116003)(186003)(2906002)(6916009)(6486002)(26005)(5660300002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AmonIobMrdFzuZGcuXm3hWmkvoOFYGTcJw+x8wByDyBLvdoqCoMiLt6yWgPJk17TLAiasG4fsUqsMZOz+rYBXdFf7w2rRM1qwO1h74upyjRyYLI4K1eGePOuPgJMJ7nQkyn1VpqB+EEi0FKNNQVHw7sfTNxUlA7e/t3zO4nxYc4L0RefqDa3sDBKfswAOfyFFT0CuGkQiiS52gmq7f6WQ3Ci9IA3GPYIqoFO/0GfEVnBCcxbjLfrjv/m2WHEXPWUWlfEFtH7XVl4GXFlkIlEJK9RmVuHE0Lx+OXUgpf1dpuO9NAFQwT8LY0oBLhaq3sNX70w4nHVpEIwK77cPbogS8R6et9OuJ8c/LTcvBX0dTxyIJsG/hJIhKmq0yiEGsK+Qhl1kYYN0KqsPsWUUyF2kWzvXOMLle5i6VARFOfsWPG7AJShjJUTrj6dxlyB1MDaHRODuB8cfn5NqxBzwmLy+b4F9qEcNZQ0OhqaES3LYqqwHittS0Kv4iTm783l02HvHz2SufaA0u3hT4azdRF7hXgUQeT7qeoGuoxa9lBShr0GB/8EcnV1SVMIrzi9HRN9fzvFdCy07/I1s7fYquqmI+xaDEFJg0oJ381vLUMKgFiCmpUB9WhjKtLMu7THUHvWUPZRWsthJF97luRecqN2UHjjW+NyG8B7+KEih0gXflA6eOV+GncjkqhJDfJuoH1qjKhWDIT+XmW0+PCGQ7kL9asoM/QfLIxeRG1J9EVOB/D2F54Kbee5SnKDYH9E62gbAQLSH8Lyz+t/aBFy+y1aHFaBHD+m6Qs+gsEOOkAd7pNigZS4iKirpioyIRP/JFWBxTeyhUaBUvxmTRmv4gcCri/j4AaQg4ug0H51vcwst2d61vKS8nDyXSdLylxmLDz6ecwiTfte4GqVS88USogSvOQK68neLBXBv0o8wp7ykmpgBn9rQ2GYeskfnsd1RuAC8/qrxObQWFS5FhPeXd/NG9gx1P9VylYUbzWj7rmmGs2P7pSRMewVKj2HEmudY3JDe7MST2EA8kiut97lE/C5nRa2zERJydeVFdwhKtS8HaLS8dkR7dhOkw9J1MLwKfgt6n4aZp3G30K4abK2wffFuP0GF0RROGw0ABzAfZ5xyRwYPb3wpLdOa2sxa5E0HR+Kb65jpn6QqXJOcICR/tTMDi1pvvtqmxdpTdxdQKNZnNrAn7JtFf2kiFH+vt7e66o8d1avB+GU4MVqtCCqoUy18cpTabrGwREEZ7F0OCwlDNmc9sBVUZxBuxPc1oLT1bpt/3SsvttK/xWnaJrosVLKVDqEuII9uLZrbP5Y5kUqOiQX3dtaC1of967X8cg1w66Bzo661+PaUYfm7tgy3VCL8+QrAGB56gOmRY7stO3YIWuAWjoByOq9GCdn/hXLsMdDoBVggMhaEoaNaBLX20opHLreGUUjpEbXC4S0KmogNTTZPSKDCAlryEROk1xeqMb/YeBuq5+p7O14JrqG6vBhkO6+9afNSidc2j2NyHtY/mqkc+6t5fS74qTZNiEoC9cVwQFN7ZQ2cVQpNvBFdf/kAve4j8QNVpryp1FR7LmAu43qY6IpyChxc6zo45zJL5YpD9zdhpdJlSUz7FHzZs4BPg== X-MS-Exchange-CrossTenant-Network-Message-Id: 82d84f33-71b8-478c-2922-08da558be05e X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:47:28.0522 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PSxsa7jWik8Xf5Vb2aUKaMOmW6rV9hPARc/ok5JP8MeFCOSusuFC403uNCoJRuDgcLJoHZ7ewNp6dp6NSSYnhIxR85346KPdjuZR8j+iPco= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2789 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org In preparation for a new cxl debugfs file, move 'cxl' directory establishment and teardown to the core and let subsequent init routines reference that setup. Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- drivers/cxl/core/core.h | 2 +- drivers/cxl/core/mbox.c | 10 +--------- drivers/cxl/core/port.c | 13 +++++++++++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/cxl/core/core.h b/drivers/cxl/core/core.h index 47cf0c286fc3..c242fa02d5e8 100644 --- a/drivers/cxl/core/core.h +++ b/drivers/cxl/core/core.h @@ -24,9 +24,9 @@ int cxl_dpa_free(struct cxl_endpoint_decoder *cxled); resource_size_t cxl_dpa_size(struct cxl_endpoint_decoder *cxled); resource_size_t cxl_dpa_resource(struct cxl_endpoint_decoder *cxled); +struct dentry *cxl_debugfs_create_dir(const char *dir); int cxl_memdev_init(void); void cxl_memdev_exit(void); void cxl_mbox_init(void); -void cxl_mbox_exit(void); #endif /* __CXL_CORE_H__ */ diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c index 3fe113dd21ad..dd438ca12dcd 100644 --- a/drivers/cxl/core/mbox.c +++ b/drivers/cxl/core/mbox.c @@ -855,19 +855,11 @@ struct cxl_dev_state *cxl_dev_state_create(struct device *dev) } EXPORT_SYMBOL_NS_GPL(cxl_dev_state_create, CXL); -static struct dentry *cxl_debugfs; - void __init cxl_mbox_init(void) { struct dentry *mbox_debugfs; - cxl_debugfs = debugfs_create_dir("cxl", NULL); - mbox_debugfs = debugfs_create_dir("mbox", cxl_debugfs); + mbox_debugfs = cxl_debugfs_create_dir("mbox"); debugfs_create_bool("raw_allow_all", 0600, mbox_debugfs, &cxl_raw_allow_all); } - -void cxl_mbox_exit(void) -{ - debugfs_remove_recursive(cxl_debugfs); -} diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 08851357b364..f02b7470c20e 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -2,6 +2,7 @@ /* Copyright(c) 2020 Intel Corporation. All rights reserved. */ #include #include +#include #include #include #include @@ -1695,10 +1696,19 @@ struct bus_type cxl_bus_type = { }; EXPORT_SYMBOL_NS_GPL(cxl_bus_type, CXL); +static struct dentry *cxl_debugfs; + +struct dentry *cxl_debugfs_create_dir(const char *dir) +{ + return debugfs_create_dir(dir, cxl_debugfs); +} + static __init int cxl_core_init(void) { int rc; + cxl_debugfs = debugfs_create_dir("cxl", NULL); + cxl_mbox_init(); rc = cxl_memdev_init(); @@ -1721,7 +1731,6 @@ static __init int cxl_core_init(void) destroy_workqueue(cxl_bus_wq); err_wq: cxl_memdev_exit(); - cxl_mbox_exit(); return rc; } @@ -1730,7 +1739,7 @@ static void cxl_core_exit(void) bus_unregister(&cxl_bus_type); destroy_workqueue(cxl_bus_wq); cxl_memdev_exit(); - cxl_mbox_exit(); + debugfs_remove_recursive(cxl_debugfs); } module_init(cxl_core_init); From patchwork Fri Jun 24 02:47:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893336 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A0DBCCA480 for ; Fri, 24 Jun 2022 02:47:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230423AbiFXCrt (ORCPT ); Thu, 23 Jun 2022 22:47:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229594AbiFXCrs (ORCPT ); Thu, 23 Jun 2022 22:47:48 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 454EF56F8B; Thu, 23 Jun 2022 19:47:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038867; x=1687574867; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=FC7St/lzkdMuDic+8vrLhdoz+08wwrk0a5ucHr2l22Y=; b=U0As67vDFPXiiVOKEjnwe+H4NWpTjETdrOPTIVZphZ8VfcLMTXxL/J6p etiuNCoe5Ch1T4ybeJQc+fqpEhr+c5wGzJSetBQOQppv0Rwyc9hjnJduU Zx26i+lRp6SGK6IWfithYKgjQIIdnwBY4OKwndT5YNJGKywzcY7uZgDKJ U4XReBmI3Rd5ZNX3LWCgKBU0VL0+F84+G6YsZLzU1sybb1T7/Dn43XUQd Q940MDHp1VucJJGTeFgj1Gpbt3vIO0CeFSvx1/J0E/KjkDJpLeV74K7i9 LxnSfPRUdw+Xh8+8lEqPwycw8HOS1htnHondzMT7xKD/0EWml3gB9OqL4 Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="269632710" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="269632710" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:47:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="731139510" Received: from fmsmsx605.amr.corp.intel.com ([10.18.126.85]) by fmsmga001.fm.intel.com with ESMTP; 23 Jun 2022 19:47:46 -0700 Received: from fmsmsx609.amr.corp.intel.com (10.18.126.89) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:47:46 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx609.amr.corp.intel.com (10.18.126.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:47:45 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:47:45 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.100) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:47:45 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e7hgnP6ZV3RWtm+HuSlG/wXLnxbMT90jouyEujYxi2Wuntq/PNVhH4QR8Z7vEuHlHVwjTxZ4e+1+byu6LK0dZX2wnPERRBrFR9MDuNBp8HtnGxgYjJBNzVWBOEk8W08D9DJfoigp3asiz4QV4qcPc+7+9xUH/vBHVZi8diPya5Ty7Lu5pTufVvfmVJ0BJrhHo+XNQuZm20huM/9E/+WuB4UTL1993i/47Vx8ckbtZhwl30WioF386SLjFq+40m3+PgOKXFhpTaN1slUEiLZuo7PZc+DnTsHoyvIuP1FmwTw7T/7L1/TqiPRFulkp57FyboXFjsejqWph3+fXc9W9jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fg72d2SkksWGZ/kPLlc5QQFLoWUWatgWr+5oJdEXL6I=; b=fn50S8hD/R3KdKF83BxOyKtsD3Z62KnUG83839lefOzue/90exzV4wnYfu+noXgm4Lvl0AVQFe8UmxSoFPoP7yK5GK/Gri8lQIc4bdcVvPUUiY4P+apoMgFidaWSF1Gup4lvLbPbUp40ZMvVixrBlr+KgkF1NfbCDLIkzwNa1ffe2SrBvXJNZfn5GFN/hy4HK4UvncY6iIG/VNFrf93wVkI4JUCyE89/W6B5cP31pTxPuWH7kXa3fbvDf3B6XU/35iU7aAZabbazTY8/a7EKuW85NGZO3YhjcEXK+/PplayuWX10wvGM44K3I4sD+5bH7sek8q5gpsr53KUO2W6neA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BN6PR11MB1876.namprd11.prod.outlook.com (2603:10b6:404:ff::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15; Fri, 24 Jun 2022 02:47:43 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:47:43 +0000 Date: Thu, 23 Jun 2022 19:47:33 -0700 From: Dan Williams To: CC: , , , , Subject: [PATCH 20/46] cxl/mem: Add a debugfs version of 'iomem' for DPA, 'dpamem' Message-ID: <165603885318.551046.8308248564880066726.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MWHPR04CA0033.namprd04.prod.outlook.com (2603:10b6:300:ee::19) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6c69707c-62a1-4240-2c81-08da558be48a X-MS-TrafficTypeDiagnostic: BN6PR11MB1876:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 76xdJBiF4O5MKIIfpyUIlZ7fN+F2T2l5RPhoXUNYp90Wu92i+NH3+T/FANAYdAPieUTSUiNDYQd+MXVnWEeAYk2k0Hu10/glKqRxlMCBUIWNwXTaGTCiFkjDWyc0ltZ+eeW9e54vYJQNHvtXqEuG84zE5NEebuTB+CUSDk+4yosqlUUdcsClK4L0XbFDciBrt8YbMMrKyv0HtSskODr0QiO6gmuJxzTIsw1SK4bbbilgv2OdD9YlsUdlcxFoOMXA80EdU60tvkS2XWaz7Y9Ai8/+1YbAcfHBFbvRBGDus+Kq+HZ4XHHICP/hJQ1GwVQdImGockiTdJ9s2YAnHtcSrJ7u28mewlIkZGkhVDzfiOUO2rd/PfHEyV+wpptSbohBDGF//Eshv5bKkCOLEmOGtc3rrahph1EDW7s5BDRHAd7Aejvw2ZCsoMlXr+25W8W08aX9+tCiAyfoLr72ydhyVqmSFokcjGYIKuiZdVCWGxwPvfjVdqeBlMyF4ZUJq8AfL/OtkNSXqVlQ5I4LN2/Wv4qhjPiJYoOd8vquf0wdxjmN65hRfLsY259T56nyTIC0FTyZMCbsAH+DpwgtqPG49Gs9t1W1Y+9WyEJKuR0S3FaiJSRnOKP7RvZoLFNlS6Jdub7wb8YzKNkedmqjSb2o2dLJs4XDJ8iiA6CZVavloxfCzbZMfwu7+NCKU3TH5ca6GKDoqv/8SzIFxZe1AJoVatgnYvkOk5x0iKoABvH7l93YHisEymNFn9jEcC0EOZ6k X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(346002)(39860400002)(376002)(136003)(396003)(366004)(103116003)(9686003)(6916009)(316002)(5660300002)(6666004)(66476007)(2906002)(86362001)(41300700001)(26005)(82960400001)(6486002)(6512007)(478600001)(66556008)(38100700002)(83380400001)(6506007)(186003)(4326008)(66946007)(33716001)(8676002)(8936002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BMCuDu5ttKPsXkipq1VyWTE0wJUBxHn0QtK+be8DnI14ve4DEYGBG4GQRXGLAqXksKqt70GaMiVbZFfnNC2DtTQlSVj91gaMhe01cU1GaEOhsuxkrCdkFjjuuW8PuNpkY7XZk5josvbUeovWfDYIPUPWXWy6hkFpPeWWiP7wq0r6ag+5+ozAYUFnAezkiAU7SBytfWtOPi/hqyTUnObbXTOO23v4kZm+fY0iMIGit9ipm5SSgGFAmO2HDzJ7S4fpOwN2lPsV+0n7NQKGrhyQ7D0Y/YeadpO0MLXxkJpS69EN7fEnoqVpPupvZZMgMwMevVjH0GvMNocCXJCpVOxVidmqOlwNAYYLvSp4L37W0619bgi+l11bx7lsqvy5o/XXa7HlGck6FiY/CKUDmGYr38momxd4Hy3bNhvXl5MaeeZZwmAWNB654VHGSgY996+KLMFsy9hvJQdJItDQ8vk6O4MyYn8uedgmZM5wZxllpB3nzmiJE2AUnTq1yEhc7O1g9lFeF+gI1RnYNUgLu+A3so662uy+d4/vZmlBzMDUq13iwT41d+XfWNVPu4mAmaileydqvy6alpEClNCQoYjeS0ru0KNGTg7p3KKhDIpy/DFE6tGcSGMjkCiL/4EVjCKzTCF7+EaaNZav04VNAZzNSL8+ZgNuEb9/98mdvjSEUEVX3jEYWWUGm+653y6ZfgbHD8gTTrIwThPdyXyQqA+j/tc2bhViWXSdE5uHY6XMsssdgBd8gFS/Zsz1MCa+US+2/wlu9Jx/aFtNRt1YFDw7KeKU9TzCRra851qqHbPq8rQHlJPkBsPDt/hPztvvj6tvbCveXXdUBIcNVB6+nYxz+JzYtrNNgy422UQDHnbkY+jYM7Y7At73YKqxNQkAde+cPG5YhebxA+cuqwFu7/2cUmosaWu944NlTM8h77E9PNzBzoqdN2hA4Smba+yJgbQQfhF8jfvov7x4/iJEPZonQFYrZvyp9/0W4d6DDrhDuhT3dGptaE0wQ/VyklP0l2a2jnOsi8iR+vJWpnVki4W78Zqx+stztIurgSiK7Ny8E25621d7M8Get1L4HIVG/UR9XMnyOg8u56jR5Nb01sldSbARBUC7D13hArYLd5mFqaQKkWBi/zU6hIFYch009XOBuPt0k73e5BkD9v9LmliUQJ8xFTMxEApnFQPw/eKoHeuXq3my283AuQ1F+txbQUBdEVg2pXbZ1xFyGv3OSkn3+8dsqVziDcblM1TSjXiRY1iruiblRiFMSuFnVXBh+XQua/1srQuJfZKscW0aH0KFtmDhel1w+B0v1HIJMBXyTFOdB/tNZLYO4IeaVCriHeBNDYNk60mdnF9DvMeg6x0Phsd9YdsSYZLW6TZ0t3OC3yYj6b/UDP8/sQKRO6eAfX17RbK29HgzyJb033pjHCND0TyBnSrI388ZShZ2jLsK7oyuAJoc/3gPOafGx7ii61emxtLmUaq0tFOTWsEqqljZYENWB9gCCbm7ZmUl05PCTgCnNzPVkiwteQ3iuLne/9sZljJgnUI76hYxPJvzc+UOu418E3BJo5aIXRE/+pesJBDgeT3Q6l0KOKTN0k31eaLmsCH/ju7kPV6r7Z4tMDRP/w== X-MS-Exchange-CrossTenant-Network-Message-Id: 6c69707c-62a1-4240-2c81-08da558be48a X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:47:35.0984 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1IRBp5oUsedigm7b9i5Il/Hbc/z8ljgyW1JmlEdTTFPGK8jI50UsaWOCywihxrIM0Ph/wuHCMf6oknYio7D+n/5Je0fdkqxeosx/rYF51YA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1876 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Dump the device-physial-address map for a CXL expander in /proc/iomem style format. E.g.: cat /sys/kernel/debug/cxl/mem1/dpamem 00000000-0fffffff : ram 10000000-1fffffff : pmem Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- drivers/cxl/core/core.h | 1 - drivers/cxl/core/hdm.c | 23 +++++++++++++++++++++++ drivers/cxl/core/port.c | 1 + drivers/cxl/cxlmem.h | 4 ++++ drivers/cxl/mem.c | 23 +++++++++++++++++++++++ 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/drivers/cxl/core/core.h b/drivers/cxl/core/core.h index c242fa02d5e8..472ec9cb1018 100644 --- a/drivers/cxl/core/core.h +++ b/drivers/cxl/core/core.h @@ -24,7 +24,6 @@ int cxl_dpa_free(struct cxl_endpoint_decoder *cxled); resource_size_t cxl_dpa_size(struct cxl_endpoint_decoder *cxled); resource_size_t cxl_dpa_resource(struct cxl_endpoint_decoder *cxled); -struct dentry *cxl_debugfs_create_dir(const char *dir); int cxl_memdev_init(void); void cxl_memdev_exit(void); void cxl_mbox_init(void); diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index ceb4c28abc1b..c0164f9b2195 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* Copyright(c) 2022 Intel Corporation. All rights reserved. */ #include +#include #include #include @@ -248,6 +249,28 @@ static int cxl_dpa_reserve(struct cxl_endpoint_decoder *cxled, return devm_add_action_or_reset(&port->dev, cxl_dpa_release, cxled); } +static void __cxl_dpa_debug(struct seq_file *file, struct resource *r, int depth) +{ + unsigned long long start = r->start, end = r->end; + + seq_printf(file, "%*s%08llx-%08llx : %s\n", depth * 2, "", start, end, + r->name); +} + +void cxl_dpa_debug(struct seq_file *file, struct cxl_dev_state *cxlds) +{ + struct resource *p1, *p2; + + down_read(&cxl_dpa_rwsem); + for (p1 = cxlds->dpa_res.child; p1; p1 = p1->sibling) { + __cxl_dpa_debug(file, p1, 0); + for (p2 = p1->child; p2; p2 = p2->sibling) + __cxl_dpa_debug(file, p2, 1); + } + up_read(&cxl_dpa_rwsem); +} +EXPORT_SYMBOL_NS_GPL(cxl_dpa_debug, CXL); + resource_size_t cxl_dpa_size(struct cxl_endpoint_decoder *cxled) { resource_size_t size = 0; diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index f02b7470c20e..4e4e26ca507c 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -1702,6 +1702,7 @@ struct dentry *cxl_debugfs_create_dir(const char *dir) { return debugfs_create_dir(dir, cxl_debugfs); } +EXPORT_SYMBOL_NS_GPL(cxl_debugfs_create_dir, CXL); static __init int cxl_core_init(void) { diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h index b4e5ed9eabc9..db9c889f42ab 100644 --- a/drivers/cxl/cxlmem.h +++ b/drivers/cxl/cxlmem.h @@ -385,4 +385,8 @@ struct cxl_hdm { unsigned int interleave_mask; struct cxl_port *port; }; + +struct seq_file; +struct dentry *cxl_debugfs_create_dir(const char *dir); +void cxl_dpa_debug(struct seq_file *file, struct cxl_dev_state *cxlds); #endif /* __CXL_MEM_H__ */ diff --git a/drivers/cxl/mem.c b/drivers/cxl/mem.c index a979d0b484d5..7513bea55145 100644 --- a/drivers/cxl/mem.c +++ b/drivers/cxl/mem.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* Copyright(c) 2022 Intel Corporation. All rights reserved. */ +#include #include #include #include @@ -56,10 +57,26 @@ static void enable_suspend(void *data) cxl_mem_active_dec(); } +static void remove_debugfs(void *dentry) +{ + debugfs_remove_recursive(dentry); +} + +static int cxl_mem_dpa_show(struct seq_file *file, void *data) +{ + struct device *dev = file->private; + struct cxl_memdev *cxlmd = to_cxl_memdev(dev); + + cxl_dpa_debug(file, cxlmd->cxlds); + + return 0; +} + static int cxl_mem_probe(struct device *dev) { struct cxl_memdev *cxlmd = to_cxl_memdev(dev); struct cxl_port *parent_port; + struct dentry *dentry; int rc; /* @@ -73,6 +90,12 @@ static int cxl_mem_probe(struct device *dev) if (work_pending(&cxlmd->detach_work)) return -EBUSY; + dentry = cxl_debugfs_create_dir(dev_name(dev)); + debugfs_create_devm_seqfile(dev, "dpamem", dentry, cxl_mem_dpa_show); + rc = devm_add_action_or_reset(dev, remove_debugfs, dentry); + if (rc) + return rc; + rc = devm_cxl_enumerate_ports(cxlmd); if (rc) return rc; From patchwork Fri Jun 24 02:47:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893337 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07343C433EF for ; Fri, 24 Jun 2022 02:48:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229925AbiFXCsA (ORCPT ); Thu, 23 Jun 2022 22:48:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229599AbiFXCr6 (ORCPT ); Thu, 23 Jun 2022 22:47:58 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D47CC2DC2; Thu, 23 Jun 2022 19:47:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038876; x=1687574876; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=gJJ/mGbkQsbbc0FFtPYAPalhNyTm4kuYNVZzqzJBwW8=; b=jZGarvxTFaZIfu/RePHQMBrRS1BsYhbe5qO9LbgLX1SAp1ZzZQIl4Nte jF005bQsOtO9vUqqDWNZj32Wtq3yRa7bBUn0nGVc++LIHXGk/uftyPUXH mfIjJ8nmdBtvfsEBUDlq09GGqIFSoo0LlxOHh6cDJ6xGoX1AQWfcJA43Y znbMps8rGB7jlkt5OPGIi59c6U/ck52J9OBhq4weXEdO9dznu71X8MvPS GvmzjFRnZc/oBEkwzNUMmc18s9a5pszV3CmW8VVeG7mFnfculJCu5aRj6 cbiZd1/O1TnTaHkKrI/WxXsQOah+NibnlYvFMFaWQk38Xy/CuL4Yv4DN7 w==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="306370344" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="306370344" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:47:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="716067830" Received: from orsmsx604.amr.corp.intel.com ([10.22.229.17]) by orsmga004.jf.intel.com with ESMTP; 23 Jun 2022 19:47:55 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX604.amr.corp.intel.com (10.22.229.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:47:54 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:47:54 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.103) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:47:54 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QQ6+KSJSJj7BhfQJcOubPNRTYJUCXvvWhyvxJZBhzLAdiCNSDFAJROMFy3qbPm3Q+QA2Wtbjt8WPq0RS4mJMHfhO74rueyMeEeXIg89UXWIgcXpbSbTiKE3lEAfueVJIzfZQelGYu6ar+7MyYFNNE14aI9XauCgVCiTxLD4VdqIaeiY2V5dVcYo4t13d39/3l/5syk7fRQS85z3ieQ3jB94sDUwsKcdgagQpSR7qMWl9qp9mTfLBPqU0reU6yLE9JHtleJGJo95liUpFJwPRrDMBrwXoPnSbrOZpO65XKOjObwhobycdFrqquTFwj6Zr9E9LyJ/fWxn6t434HJktgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=g424Rh+fXPZ+YWDn7Z9CnhBLoeysNzSdZKJptuUaYH0=; b=mtAKidz/dpTrELswNDofED7g7vM9k34mnWIGwxwLxfqZoq0EkeldB+cLqwUtafx9xplgB0SMq58OAxIKu2OxOtpHk567Adzu6RvbWIZQoNdACKvlCSbjbQjiLWWRqSmZow7rWLpjwVILibIp/aR4U6oLCOPcTZPr9zJCvRyuKl4hTT0bCJtX+ZNLf73Z94E+Ncllp/wLcRUECEV1w6EmF2YClukaNK5J9IufX7m+HR9+oQ15R2dQMTAh4DxH2Iv+cotH4TlK/I0rbIGI8Rbe/XjHbegVRpERKqlGsIqm014w1/tOdcsAHW6SuFA3YiGA/sFobY8IfdiOY+ma9B3UwA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BN6PR11MB1876.namprd11.prod.outlook.com (2603:10b6:404:ff::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15; Fri, 24 Jun 2022 02:47:53 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:47:50 +0000 Date: Thu, 23 Jun 2022 19:47:40 -0700 From: Dan Williams To: CC: , , , , Subject: [PATCH 21/46] tools/testing/cxl: Move cxl_test resources to the top of memory Message-ID: <165603886021.551046.12395967874222763381.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MWHPR18CA0039.namprd18.prod.outlook.com (2603:10b6:320:31::25) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 262f64e6-1015-4568-56c3-08da558be8bd X-MS-TrafficTypeDiagnostic: BN6PR11MB1876:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AQE3EjWQCGE3/M9aZn7lHlK/ZxrJqDLR5V1t+VmE+exvbzWe7stoKfB1tpDebJAEe9mRwTkw9usgsyANt+ZExBS+rX69nsV52qfgi/Q+8XWAjcRJ0627epjQgdydg4BpvIw+VuToxIp95L1NzTsJr0bjtuPv29V76ErGYMR/VmaDD99BZFHehAmp8zpOKpTctCiHAA5JtEwVVF3acJssNMe1hNYOFf1kobYPIIzWVL0qe4SL7XHCesituNv/VSEvetBpmx5X0DSET7JYJJLZ6LgH4Av6/h2ORczpNXrOcFvNdL/5q8llfWUk/uO5A3bPyF3LAlXgpxPV6jkQifP0eBj+euVBvPXrjmTmaS07skRHCgkl3elZyd10hzehsUC1v7KEH/HTXdbyalHMsNDVr4ofWeF5DE0zlpV8tXAlNqczoZ1gYFKLdqUEu4UKaalKg5ferp4IWQ5Zcmk9ybErDTt9qwfR7y/W4vD0Ubfkhos2KI0dmpiy+C30tIF7TQmdl0Y9SifTD68eZN26o+koea6itP6EtfH3CZ/nFxeJZmCHaPBDYPm7W1B6sDU88IR7EzBykAvUhXUWpaISeUAle2mW5KV7JQTwwELm98wlA6UTZUrhYVaNJYFCkVORlH2gWaSGlkSDVrY/twTDaNCvCSYDmwrQhyjQzsebDIQAyQPtnk97uoJabOMT2ANz9onrzH1oUaRlUxnP2h8FDLzrinZ9bfTpXH2ozSNWm7CbRtIAaaq+GD3WOQyXOdUMhIgZ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(346002)(39860400002)(376002)(136003)(396003)(366004)(103116003)(9686003)(6916009)(316002)(5660300002)(6666004)(66476007)(2906002)(86362001)(41300700001)(26005)(82960400001)(6486002)(6512007)(478600001)(66556008)(38100700002)(83380400001)(6506007)(186003)(4326008)(66946007)(33716001)(8676002)(4744005)(8936002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3L1wXKvUIDv+yXixfK2VnfTM8573LtoujgF6QX75jPb/6A+mdVKZMIfaP/+nqdABbM1LRVnxRDjTDDmZ0S90d9pcqYWgDdZT8tv26ttuCKOjeJDE7bMgRrvSoC0zeVH1TbYVWccZTvj1fURfNCmOU+ndoTlq1Rcx/JosQN2mXR+ctcMZTqbOV9tjVQMF9oJyFpdK7qJL/kjuAlqZPbqtg/XEQCXqapW47Z+t7F6KnAdA2IZ0D8IksI6Tet26Yj3nTUWhjTYHLEX9Vnt0Ba/MTlgphvsxKFO5IXc2r7EQxMCsQnRyKMsGib/tdizvLQL+LySdXtf2kJ0PYroJWuYotrEcp+KGCDiuTA14JSFXYadwugKLQjtjWS9+3LzUQbV2AHkawgWU+A1VvkdcLlbJ7sg0WdABhqh2bffFZSdqC9c9oQ2fiQZlspb64EV03Y/wZxcfHx2dIt35iCgYUa2PSuwNpLFKS8626JNEe6XtwNY6m4tAwFoH0Wfd20SJz4umF8K45VaKv2gSZlhhsY/F0uOUKM6XH0mgbAEEbTkdVOyrrMXFXVc35z3u1rWDicNycatnYDSKde+HU5A/TeOCspjVYokpMhWkfiU1jQMiQVo/zbkbsJIEufpJ2a4K/VEZ8Y7B2OA/6T9hop7xZ0f5n/0Vbe4waUkpoqzliFC1D/xEsk/3A/2AFpeJPbejckmTfTw1TNcpiViwAg3CVfZn40hcmI11G2d4piiX1AlnmAuyEzTRBgA3htuXXaRwBqSfr0a2GyHWlQa5wangz5xYD2PdHiG8eCvr1rztxJUpNspmxWZBW3gsWX6aJLJEmLJ4uQvVwxA7GdncjdxYF0zYL2rRRTTxrMpl3Cottc/zum8DhWL5oASu2lGPhpP4MJTOaRpkR8B8Dwjw/77lFGa5DnZtcJiLHQBkwcomVqh10etxetmuYQKRISquoya2p9agdOGWyr05+hlgvde3oW2dE58o7Ru1nfpThQyvIok/fYV3RJMcX38P0v1QzhojINVysGTjwpFLkm0Fxmly3butNhQ53TjjMLI/higo8YS20LPQUAUxcK9p820GyfsrK78DUeZCH8KBTDza4mZlzKaTBS7nI/LFN2xNr5MjzS82sId7JmyCzzp3zNAnMN5eD8zkduXnCGryTc4cEE5t4F4PmL/ED/ujdFQDcURQX489Z5feBSVVQ/KZvO0nVITMjjCdg1iaoD3U6hF7/3OC+6Uz2NSkaynl/EvNEIEgpf1r1m5Ih135B5a39Z/GDo54MbirvW7KGFdFZ5ALgyFd3Lk6ZD8917cYqF/aIA2swQwADtdyNIkIAzvERxXDsr0v05fpsnmgEqLABsiqG5a6H3ifF2w3OcfuiEcevKHewYVkGwdV6ESCRKbxzB+1gYwkIQeECFm6Sm1o8ec2C/o47Gj0om1PUGXzApD1ANGlzAdAB6Q4hedXjldbXpW0OSlt+TOfwFQUg9hrhW3mutaSvIJ4ClYhtIMDLeSMJ0BGUinRZzCGlb+bZxkUv9FeSlFgb+4tGzpSqlohj+hZrfQP6/0DJQnPllgjPsld8z0whKoGuWoSDtOc/l5qpb9L+hkmntP4PvRMgavE3rrbuZxkvmXbyA== X-MS-Exchange-CrossTenant-Network-Message-Id: 262f64e6-1015-4568-56c3-08da558be8bd X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:47:42.0977 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: o4j0ZAakRuuiqe4mzrQvT7xOArOzmbOBIehNMOAtKf8VKePV/GYwLVShV5+3cqsQf7AwoQlsynEkiQwmzBJgbkf46iesoQHNgwQDFv8EfgY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1876 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org A recent QEMU upgrade resulted in collisions between QEMU's chosen location for PCI MMIO and cxl_test's fake address location for emulated CXL purposes. This was great for testing resource collisions, but not so great for continuing to test the nominal cases. Move cxl_test to the top-of-memory where it is less likely to collide with other resources. Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- tools/testing/cxl/test/cxl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c index f52a5dd69d36..b6e6bc02a507 100644 --- a/tools/testing/cxl/test/cxl.c +++ b/tools/testing/cxl/test/cxl.c @@ -632,7 +632,8 @@ static __init int cxl_test_init(void) goto err_gen_pool_create; } - rc = gen_pool_add(cxl_mock_pool, SZ_512G, SZ_64G, NUMA_NO_NODE); + rc = gen_pool_add(cxl_mock_pool, iomem_resource.end + 1 - SZ_64G, + SZ_64G, NUMA_NO_NODE); if (rc) goto err_gen_pool_add; From patchwork Fri Jun 24 02:47:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893338 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D976CC43334 for ; Fri, 24 Jun 2022 02:48:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229599AbiFXCsI (ORCPT ); Thu, 23 Jun 2022 22:48:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230022AbiFXCsH (ORCPT ); Thu, 23 Jun 2022 22:48:07 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E8551F634; Thu, 23 Jun 2022 19:48:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038885; x=1687574885; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=LlgkVbo0FZHXa/GgNvNhK+JHjqH0j3V8JlVssinAKxE=; b=ep9+hFZgAQxYrpS1MYF9UUoz5T+lFZPTpHnMFSx4DXSmtPv+IhkHaMI3 ceG9BuCGhxpCjahZZqXPBFz+HWCi0LysgZqdljnaim3QIxi07Pu3jlrCF 6ICCWuf+unYFUwizUjtjMJHqUNh5DILEihh6CF5nC+lSyE0R+GuXEfJQW 3ILv44ADAeWu1zFgq0vIVTqfzmtIe3t/yILfmt6K1wxTJV+r3tMJYcA8i NshUJWztn+7rJzeesW5XGFabmlFi4EzlR20NK6i9l4VEzT7JCiKMVO1w9 RbHgK7HsIkLGtCXnUYBkoif1XnXZMSruGCzFqstX1KZ4PjU13TGi+sUkI g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="261332064" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="261332064" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:48:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="615817821" Received: from orsmsx605.amr.corp.intel.com ([10.22.229.18]) by orsmga008.jf.intel.com with ESMTP; 23 Jun 2022 19:48:04 -0700 Received: from orsmsx608.amr.corp.intel.com (10.22.229.21) by ORSMSX605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:48:04 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX608.amr.corp.intel.com (10.22.229.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:48:04 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:48:04 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.104) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:48:03 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UrwUyXyCUEjGbS0wMhX4LUB3s48KwLlfi7lMYn9hKjSqOgDVXKbXzvWb5ZfV4hu62ppmiDlQBHHb3ytkQ7rPJTvtW8zVcWq7Flc/m0rALt1t23McQWUc9J2kZGMH3iLKdOAk8uEGwJds2hFc47sOF79LtOtCv3BqYtAkZJ+/44ihq63GgR8zBxCrZOE3kkuXrxxT2nl5n/UB3IL+jpIaBvY9pxCU5kFN8UUQib0AZb5P4BFKqYi6ouYe+A4B6n3vkly2NYwGou8v5KnHiY8U44fWL1Y/jWiqSdiBUSwPMVM64kIF5dPQ7CLiG/ea+Od7TuC7E6YZNJGFOJQhlSn03Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=e4H/LBLjRbx1OLrQJiOoIm1YURxE0H3t4AT8T1pIWOE=; b=L/7XfMcNagFCNtFOqLsP1szNLTclBQM1YiJHUi6iReOKHniUaRJ6R1y5ePKITlL9P2Vvpd/QGtU+IvCNe5hlp1B/KuNEw+hFkOwWY6hebGPvVezeg49w3JFBpWjnAF2R1RyWLDhn8vxvvmAXYBIjobRMEFhqUnthlz5JQAJ0xffWoLOL14TAa9lnQee8UWg0CfBc8mQ+8lLAaArdgD6DPmUULjqIME09afy5dR2U5E2pawvMly2bQkWKi8XmPr0jnCUjaFs5kAPFw69kKHV0RW0mX8Nmt5PugfZqgOHDt+Kiun9t4opElbNCjt5cCZYqW81zaaveZ3d/NWoH2xGaLg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BN6PR11MB1876.namprd11.prod.outlook.com (2603:10b6:404:ff::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15; Fri, 24 Jun 2022 02:48:01 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:47:59 +0000 Date: Thu, 23 Jun 2022 19:47:47 -0700 From: Dan Williams To: CC: , , , , Subject: [PATCH 22/46] tools/testing/cxl: Expand CFMWS windows Message-ID: <165603886721.551046.8682583835505795210.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MWHPR07CA0002.namprd07.prod.outlook.com (2603:10b6:300:116::12) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 075e2e69-2a9e-4e98-0c66-08da558becdb X-MS-TrafficTypeDiagnostic: BN6PR11MB1876:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 27VgnsuyUubuunoNIg+5VsH2nbjNpzyqbsKQloIlPLKwMJ8LER9CHJfuXycLkDTuP/GeBy8Rq6Rk4rTy1KSL2jzaHKt9aelStKKmW2JGfy9MkupWWZWMrwCZj9Xgh/ljlLD3EytHK6zjuHoSaB6orZVBedlSfAyjtcs0ny7LGkKToYuOKGZXgqDNhFccxq+cCUilgCK2QkLmHWwF8M2fDY8nq3EEbYJb8c1hgCU6ZdzuOjkrSvorkhqjGIpgRY7NzV83dc54YaedA3fnKAkGcspqqeanAM9Zsh3EbbYUMXJpvLQ4EUDZ13xBkxh3tIvBA5DN33eKCB24v4uHVoQEzlGBVkVHz8+0ObptS0RwVsgPrrEwHmJdvldTGkkmgN1wnI3eNhOwo9w5wdRTkJcAUqjTFVllv8SJQrvQIpVTDud95MxndBdgQUEu6sKXEWSqkYkv3wRQQrgfnP81nuG6hdzueYKyK6V/w1pRICsM3uAsNQOmWHPovL9JJ9KTe1AG1uKlskmTCfPyvbENZ8yr/PmZtFac/LfJ5xR34A4P9MJYx4/DCqgyuTk55cG2wrt8nmAmesAqzDJOmwGZLq6chx6jpu4iQ4MmeLJJ3NXBtAYcX81xPBX+jeJwrBSZb6hzXzpsAvzyZsovroiyvwlZFAityOQgZEpmmsC4+pvm3PFrY/p11w/8uRz0Jew16YEyOMy3JSdaVwj+/m5InJkeqHVrAW3Pqz5790l8+Tpir1B8nM9et+XYbIkNZN2wOxL5 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(346002)(39860400002)(376002)(136003)(396003)(366004)(103116003)(9686003)(6916009)(316002)(5660300002)(6666004)(66476007)(2906002)(86362001)(41300700001)(26005)(82960400001)(6486002)(6512007)(478600001)(66556008)(38100700002)(83380400001)(6506007)(186003)(4326008)(66946007)(33716001)(8676002)(8936002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bgJCg4fAFml4f0TVdYav9X4tpuOqv/sYo8mQYoSz1HV//z4KGRGjN8Iry+vokpbBd1rqUZ3WqDJzaGBc6W4rqBFGPsFZt3wKG7yxk1PrQ263iDefOqfcbSWo5xkEpcboxe71qorlotfD6iJv/vUqrPPWaOGWgVxlrNcGQHGLFOOLXJD2RuHXO4RTm4byd4TyU+uadkVtn7ebX2+g2vbTEkGrKQRt8YjP1um9Brred6+M9FlhcwKcffZSwzvKaKg+KJ5R+/09oUs5P/Qgkx6KDBgiKcM7p1ydh+1HEdR/iaHHSbl5YanjFsqZJsSUiCgR/1PjeynGZJlxm8ELOVypqpTFEn/wZvRo7Jesc4mFdWrXYjDUzf43XL48yAF0AA/bqqu8ymlnZIA7J06MdkoDYMJECCNhOV71FLpBcnjGJ2fxn7ifVr4MqBez/j/8wmI9b5c55+wI8b6QpPfKBgxWwFyN02CsZwIFeog/dn4EEtMil76si+a6tGV/CyyDZEHwurJkbp39C1waNxdHrUHoNkSiZFkzHDtFbyHiWlBX2oi7cA2V+ap2+FB+gYT8vMtbUGcYR3WgFrcPQEVOTcgBxTrPXtmCe1YhTBOT3sFOQdHFgCKAopTEhDnF3Z5FOuL9Q0ZNH0+M+K1jsGhMACCObUukG51dDSDhkRi+D2UvsvtlktNBTZqoy36rwkSNfV09P8MFxCI3CK78NJsyBEu/T3hWRJfD4QrbIZdMCkeiq9eGaL+0iUONXXGSSeFH6rqbdFzJ5pgqVRmBV678ulCmdXE6vP7PvtR43UXuy54zKqIpoEWP4XrP6e66Bi+wuUzM3jTbVp989uRzWj+ksTh+TWbAYkDzajCLOtty0ipDC9EXYQ46LeeHD4JOQEcYTD6SsQ1ZPfxgemPXgvHPB76Zksvfe5pmfMavIN1E4rQPxUFKFiThTbonByw3ediqL15Kv1fXfYbWQ+SGNU+7tLlUW12aCBnGmyFYjdrbNt94aHXpm5oq7EkE/iO+MhOKunMkaOMQ2u68xEmX/1RAYY7uIQf6xFwldKJynlEHQ7PHZDnTOrzkCgJVDhimrFRZEO6PT3EAlFpz1JVkJxugxrdJbWaPl8hHJ0zQY2uHtIAXPnEL/p0+Ab/VjLBMSpetbBThqT/jimxWaqfdXddQ3EPiCBvtYmGOZ/hStgEe/Zcr0Phdh/UZ5dKTFrS5ae/xMYoQgGfExCTouklU597AotBpmNNnT/pQ6PbEAitD9mQN04i5gISRia9gMHzx31aWVROhTsAmrXD/YpWfc+s3jNGe8ROgzwHd6NKshgSpziPLWzWCcMscmRRROn8AlIvkzT7nn4RAzelaGGOTkm3y/FFmgy5uvAVtPJpAZvT+tJoUTYkJd4dgqUHMUUGDfuzQuFNQnsz8uWDnTpFXd+MhhJfBAoxoXBMOwq6KD72Z1QS+2u7pkxbt+B/trDdibEP7UsO7qj0Srs88v660tsKbv5g2z2+gDyAa3kuAm+0eJk2sSdnyOzSfkz+IxRlRbjQjfit6em2/i9IBbP5C5t89ygP7WLZXYUOWmfCzVF8ZEkLLbqxHCbFxpZaOd4Nxy+Kr7sqvQykRtzrjwBCzqkHALlEJEg== X-MS-Exchange-CrossTenant-Network-Message-Id: 075e2e69-2a9e-4e98-0c66-08da558becdb X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:47:49.0033 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dmaXfjeroxkKzrJ+yphRyW2kVig+2CvN5m0P57tKaAoHkc90qlAAU07GN5TFoLwpnNKWak99RgCbOBhLXiTkmPsiqRZVPYHLz3YW97uUTlo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1876 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org For the x2 host-bridge interleave windows, allow for a x8-endpoint-interleave configuration per memory-type with each device contributing the minimum 256MB extent. Similarly, for the x1 host-bridge interleave windows, allow for a x4-endpoint-interleave configuration per memory-type. Bump up the number of decoders per-port to support hosting 8 regions. Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- tools/testing/cxl/test/cxl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c index b6e6bc02a507..599326796b83 100644 --- a/tools/testing/cxl/test/cxl.c +++ b/tools/testing/cxl/test/cxl.c @@ -14,7 +14,7 @@ #define NR_CXL_HOST_BRIDGES 2 #define NR_CXL_ROOT_PORTS 2 #define NR_CXL_SWITCH_PORTS 2 -#define NR_CXL_PORT_DECODERS 2 +#define NR_CXL_PORT_DECODERS 8 static struct platform_device *cxl_acpi; static struct platform_device *cxl_host_bridge[NR_CXL_HOST_BRIDGES]; @@ -118,7 +118,7 @@ static struct { .restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 | ACPI_CEDT_CFMWS_RESTRICT_VOLATILE, .qtg_id = 0, - .window_size = SZ_256M, + .window_size = SZ_256M * 4UL, }, .target = { 0 }, }, @@ -133,7 +133,7 @@ static struct { .restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 | ACPI_CEDT_CFMWS_RESTRICT_VOLATILE, .qtg_id = 1, - .window_size = SZ_256M * 2, + .window_size = SZ_256M * 8UL, }, .target = { 0, 1, }, }, @@ -148,7 +148,7 @@ static struct { .restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 | ACPI_CEDT_CFMWS_RESTRICT_PMEM, .qtg_id = 2, - .window_size = SZ_256M, + .window_size = SZ_256M * 4UL, }, .target = { 0 }, }, @@ -163,7 +163,7 @@ static struct { .restrictions = ACPI_CEDT_CFMWS_RESTRICT_TYPE3 | ACPI_CEDT_CFMWS_RESTRICT_PMEM, .qtg_id = 3, - .window_size = SZ_256M * 2, + .window_size = SZ_256M * 8UL, }, .target = { 0, 1, }, }, From patchwork Fri Jun 24 02:47:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893374 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5D16CCA47C for ; Fri, 24 Jun 2022 02:48:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230380AbiFXCsW (ORCPT ); Thu, 23 Jun 2022 22:48:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230022AbiFXCsS (ORCPT ); Thu, 23 Jun 2022 22:48:18 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E41F56FBF; Thu, 23 Jun 2022 19:48:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038896; x=1687574896; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=AXk4sBysv9W4e38zw/eG1wtIWp3QfmG2ukDIWm44Px4=; b=lQONm8h4qpNeZgRxT9xzX5jh8RvHD/mmVIb8XC52PH6uyx6STgX4xQNP fm+38PDZXwRzg+jtPRWCLF7cIWnpLKUOEWaPwkEXOoRjG3TrChBvNCi2a ajBpC4a4XdXQqojcPX5SWxtKFD7FIRY+CC+T5r8msTLs/S/3W/48j8EA5 2iNBXWygtvEFIcwq+Ktj9z2GXJdl0B9cZX93jhSfudO0uHp/0YX2pFRsi GHOev4AtvWEHBfhhw6ETZuxIBLu1tOmzho+wApEqn/I3Z07uSLoW9Lais 9oDUz3yB2ckg4fFoBA0iXavXVsNnOe/FhxeSPw0qAkIxhlO51/qw6j39i A==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="344898677" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="344898677" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:48:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="731139664" Received: from fmsmsx605.amr.corp.intel.com ([10.18.126.85]) by fmsmga001.fm.intel.com with ESMTP; 23 Jun 2022 19:48:15 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:48:15 -0700 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:48:14 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx607.amr.corp.intel.com (10.18.126.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:48:14 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.100) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:48:14 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RNYRoYDQa/045JZemQy8gUapv5OyDj9ZJGJ7tOPGztXyrqrSVFhcsO+pqPOo1mZm2n4dQ/+qkcV+IRzT4eqOtScxI/WBpF6xy+MmTckbXwe1++vcwHPdecSc8fycVfg+7JDC/zX1CAEAMYdL20AlcmNzeF7Ozacm5flup2HxRpxlkH+D5ALL2+18buIyWGc2LFSNAsMgMwNTskfAocpoHmbcnr3R3nJU7yqhVrktBWvOiL8RZiBvAL1GnSVfBUu1ObYB9vyGNWK3VjoaqK8FuvzDYYLmbkpYdToiFd1C+BiZIhCDKpJsMuh7eRhEZZ9FA1X8rHjK4djBoibhKAWpFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kNJ3L6EkGykBpG8atfsW1a9E1xyOZv+g5W9Byx5LGlY=; b=E4/Wsj0jgBn/nukOwfC0jnOKM8mwtMmuQ1OIbJwAHXCwYTP/crsQWDVuXiJ90f7hZm5160l2fLJq4h4MZ+aPaSc5X7TzADPDjd3fJHPMeSddyB3VwXxsEx1EobG7MzplMdo/rIcs1WQo6tKrIFOhp4JW+UyasmgxY3OxgydDK2q9XRHLCN7DfiNRBmFb7oALdBYizROZLDq1sfpH52XwjbLgL8LTLPDDTYSZ36cZj0JYQzrAq+ryeEIDFZI02FQ5LoYcsVoCeY257FtnpJ381ZardxaHzP6cwydghcq/ZRUqPsXwELpyugFGwNEaGqTU+s+4E5zG/XJ4uAJt00xdFw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BN6PR11MB1876.namprd11.prod.outlook.com (2603:10b6:404:ff::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15; Fri, 24 Jun 2022 02:48:12 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:48:12 +0000 Date: Thu, 23 Jun 2022 19:47:54 -0700 From: Dan Williams To: CC: , , , , Subject: [PATCH 23/46] tools/testing/cxl: Add partition support Message-ID: <165603887411.551046.13234212587991192347.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MW4PR03CA0277.namprd03.prod.outlook.com (2603:10b6:303:b5::12) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bd2c629b-6bd6-4c53-11e9-08da558bf0e8 X-MS-TrafficTypeDiagnostic: BN6PR11MB1876:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EeLH86wUuBStBJbdFSD8/TrTNCRuj94iuL38HKFDWqK1hSuYdI5GzCFwlAU1+SYIJZpQXvuc5xHAHyhcj3tXbQdktzb8ygvpmMVYrgy2SJijjmsMb+Nra7aGohaLZqkiSK/Q6UUDBbBLi6OWW15d+8WpG4FpWJuV5010HYTyMLrylOhluDa17HdvL2HmkdKJMOj4DeO5/pdLGblNexCTuEGNKLpFs/S2BSt3vhou7CQKKKv8VMSxxDuGAmbgvolfSZa0HO8vBnLg8sTeRKDzHlpYDmhjZS8TkBLD0z9eNf6FNrKREM8DxYpWnjeed0Nnornq8zGW7O8ooZQBeykEmgy9iMOhF/pyW1PWaH66Ndx/cN64pnbBTwXBeuvdcI3CAr8p4YdJGpESnuWTK3Yb2f03tIYAxXopFUZALF9Eoo8yoct57DeTzZElA2lM44XEBC3UqjhlDHVOibTIGYHY/BFPa3KwIQVbRdbsG2rAg/cy1x1URLnBIRYQGXIwNggi7+gIF48Q1GMfJl2Qk17cVuy1wsYaMLOlRQa+9n+WFn/IqjkzfPQhFYkieA/pkX5h4pX0J0mb7yC14K+72k3RLfT+3XTpAs1ZIRDTwr8gOEn3AmMpmkLjN24No1oFHSzGF+fVIRr8H/3Rr77yZMXgto79VkIC1t/TRAlpQ1Pi1kBZ961hdtTybsxzqxhcQxv1RY1xwHeLzSzfr6oJQ03L7CgB4+MyD852aDKGkI2arBKkjeBgnjl8MDaiicYxO8Z8 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(346002)(39860400002)(376002)(136003)(396003)(366004)(103116003)(9686003)(6916009)(316002)(5660300002)(6666004)(66476007)(2906002)(86362001)(41300700001)(26005)(82960400001)(6486002)(6512007)(478600001)(66556008)(38100700002)(83380400001)(6506007)(186003)(4326008)(66946007)(33716001)(8676002)(8936002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Nsum5WaeHUuk8vkDQtTbzcdZqUN4m1yV1cRblOigR35dOhlG3ioD2PYEQ1T7eOpsingm9+9uLb++gVhcADekPc7NPUgXxsyRHKdb0pPffLnju6B/jEtOzmE4pa6bovO/R+8GTrlkI3SB4H41dLZqFSZZKhRgkRHZDNaISWhDALTfkbyo6IRZzuCT8Tu85Pt4bdjS/mhwji1SOvoLghkiZT7/bN2wZQ0o9O6LhRFLCBIKoChEi2I3ViuNl77iBhbQXaer+g2bhj60wF4QYPMKcRIv6t6zjpUF025ZNDQ+fE1TfMsnJzZR0qIXRW54OT7MawMnERpuoicqQBKlinWSLFo9TdmO49vruoesyb9cJ+TLRKds20doRYFkbxKuc85NxT2bqpiERRwXCei6xYxoJl2BJox+03gwATdnNnCdY96f+qSuHqMeLOptdsDqDNkG8G33RIGHbBUY6Kr90ucp2i2D4E3VtvwAcNOKd5HC4EUkwaEbkW0Eapqz9KJkHGGLUVSCpEuWr8ZSk2MPMJS1PFjyDsy9btuJSuExHxohd9/bhtZJDynBO/RDJTLwO8OW6Lc3C4p4Jc/98PToezsDn8VCD0Vu60nKmHKVvkpzaYWH7fDrLjsSTf22Tb19KyJOVfsuanoP7Le308O1IiAktO8BIkg+k22+gGzZ0VfPcTwKW/jfE2VjnYks4kfMh3RsEx/rvsP8pQG1EgH+/TtZwx/zh/TibN7HcLJ4422l3wWSRNpvI1Z+nTqJ6If2FbGmUDSuibHtL3yy5qkVihcE9qI/8w2Phetu1GXpzeVM3YmlBBuQ4HK/q+y4kdj/aYmiogpKWRuRnDxXVRsWAir0+xL0IjLBGJVAg7xbLjOAf8PRPphFq9zvRay4UuVe6gyiV3PAs6UIK4FuBhWfkSIVB+osP1HC5WNi648TMCOa42dq1BazQxJKi+t19o03e6coCPiSIvL8UGwfdiUCxR0+o53qSLbRUqTFFLA/AcK5fWcZVB8u5z+gkOPlvIpZ+jjdMuj4BY8/s/QAuVQNlovfzQeBeYIsIpWL/NJM7pZ9JhHzWK6YZfnPUyntcGn0odF/FxeLa4WW8oECEwRTwl6nKGrQ6FiCTc3sL3V+vfHGqPjKx1yvVvExzL5HrYmAEtEQ4gRLbxt2YFnAwSOcVFbbti2XpJt8F4B4mRyTGzi9Zh7Fp0+0mWOfNvcz5S0ZdTtKu9UhiB5fjWrGMwzL/t2mNx3wxpUlxOFS8csw3UZSjR4Prv3ZDB4C8/zbQyNfGmX88lwHB+G3lCcspMNF0EP8R53j8b0Fv8QuBIGKqI6d7NhZKco4qrojnXgyj5LW3Gi+V0hXjxQMwZbJDtJKNNTD6KSJV4lYP4kBrHExnRi2jq8j9xAQLbLDVkBffg1bKb/lLtddItMUW6rucPm6EcTBxBi/KKwTTy4kSFyVBlN10/oiKPtKyppqZwesuLvc70niQK50kPdbdBonO92jnbMFj8M/Po1mScq1yK4sNY73YljchAM3NHdQUEc09cUD1xewR5p4ZwPTZDra53G4h9BAKsi5FOTep0+ND89FTZzbIrXWv1gR9KPaY3fJa2wnaSZk5eGUBDGpir5O0YDuJOft7Q== X-MS-Exchange-CrossTenant-Network-Message-Id: bd2c629b-6bd6-4c53-11e9-08da558bf0e8 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:47:55.7996 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: EVWaC8NA6sDmHgApFuSalHcBc4+fuQMxzsJw7JYoh13hGWC0Bn4uvQ6KANhSqgv8z+Qt7CljdhA2D6fRUxl7jNuY1M7ybwsuTFryI2Bi0RM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1876 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org In support of testing DPA allocation mecahinisms in the CXL core, the cxl_test environment needs to support establishing and retrieving the 'pmem partition boundary. Replace the platform_device_add_resources() method for delineating DPA within an endpoint with an emulated DEV_SIZE amount of partitionable capacity. Set DEV_SIZE such that an endpoint has enough capacity to simultaneously participate in 8 distinct regions. Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- drivers/cxl/core/mbox.c | 7 +----- drivers/cxl/cxlmem.h | 7 ++++++ tools/testing/cxl/test/cxl.c | 40 +-------------------------------- tools/testing/cxl/test/mem.c | 51 ++++++++++++++++++++++-------------------- 4 files changed, 36 insertions(+), 69 deletions(-) diff --git a/drivers/cxl/core/mbox.c b/drivers/cxl/core/mbox.c index dd438ca12dcd..40e3ccb2bf3e 100644 --- a/drivers/cxl/core/mbox.c +++ b/drivers/cxl/core/mbox.c @@ -716,12 +716,7 @@ EXPORT_SYMBOL_NS_GPL(cxl_enumerate_cmds, CXL); */ static int cxl_mem_get_partition_info(struct cxl_dev_state *cxlds) { - struct cxl_mbox_get_partition_info { - __le64 active_volatile_cap; - __le64 active_persistent_cap; - __le64 next_volatile_cap; - __le64 next_persistent_cap; - } __packed pi; + struct cxl_mbox_get_partition_info pi; int rc; rc = cxl_mbox_send_cmd(cxlds, CXL_MBOX_OP_GET_PARTITION_INFO, NULL, 0, diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h index db9c889f42ab..eee96016c3c7 100644 --- a/drivers/cxl/cxlmem.h +++ b/drivers/cxl/cxlmem.h @@ -314,6 +314,13 @@ struct cxl_mbox_identify { u8 qos_telemetry_caps; } __packed; +struct cxl_mbox_get_partition_info { + __le64 active_volatile_cap; + __le64 active_persistent_cap; + __le64 next_volatile_cap; + __le64 next_persistent_cap; +} __packed; + struct cxl_mbox_get_lsa { __le32 offset; __le32 length; diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c index 599326796b83..c396f20a57dd 100644 --- a/tools/testing/cxl/test/cxl.c +++ b/tools/testing/cxl/test/cxl.c @@ -582,44 +582,6 @@ static void mock_companion(struct acpi_device *adev, struct device *dev) #define SZ_512G (SZ_64G * 8) #endif -static struct platform_device *alloc_memdev(int id) -{ - struct resource res[] = { - [0] = { - .flags = IORESOURCE_MEM, - }, - [1] = { - .flags = IORESOURCE_MEM, - .desc = IORES_DESC_PERSISTENT_MEMORY, - }, - }; - struct platform_device *pdev; - int i, rc; - - for (i = 0; i < ARRAY_SIZE(res); i++) { - struct cxl_mock_res *r = alloc_mock_res(SZ_256M); - - if (!r) - return NULL; - res[i].start = r->range.start; - res[i].end = r->range.end; - } - - pdev = platform_device_alloc("cxl_mem", id); - if (!pdev) - return NULL; - - rc = platform_device_add_resources(pdev, res, ARRAY_SIZE(res)); - if (rc) - goto err; - - return pdev; - -err: - platform_device_put(pdev); - return NULL; -} - static __init int cxl_test_init(void) { int rc, i; @@ -722,7 +684,7 @@ static __init int cxl_test_init(void) struct platform_device *dport = cxl_switch_dport[i]; struct platform_device *pdev; - pdev = alloc_memdev(i); + pdev = platform_device_alloc("cxl_mem", i); if (!pdev) goto err_mem; pdev->dev.parent = &dport->dev; diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c index b81c90715fe8..aa2df3a15051 100644 --- a/tools/testing/cxl/test/mem.c +++ b/tools/testing/cxl/test/mem.c @@ -10,6 +10,7 @@ #include #define LSA_SIZE SZ_128K +#define DEV_SIZE SZ_2G #define EFFECT(x) (1U << x) static struct cxl_cel_entry mock_cel[] = { @@ -25,6 +26,10 @@ static struct cxl_cel_entry mock_cel[] = { .opcode = cpu_to_le16(CXL_MBOX_OP_GET_LSA), .effect = cpu_to_le16(0), }, + { + .opcode = cpu_to_le16(CXL_MBOX_OP_GET_PARTITION_INFO), + .effect = cpu_to_le16(0), + }, { .opcode = cpu_to_le16(CXL_MBOX_OP_SET_LSA), .effect = cpu_to_le16(EFFECT(1) | EFFECT(2)), @@ -97,42 +102,37 @@ static int mock_get_log(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd) static int mock_id(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd *cmd) { - struct platform_device *pdev = to_platform_device(cxlds->dev); struct cxl_mbox_identify id = { .fw_revision = { "mock fw v1 " }, .lsa_size = cpu_to_le32(LSA_SIZE), - /* FIXME: Add partition support */ - .partition_align = cpu_to_le64(0), + .partition_align = + cpu_to_le64(SZ_256M / CXL_CAPACITY_MULTIPLIER), + .total_capacity = + cpu_to_le64(DEV_SIZE / CXL_CAPACITY_MULTIPLIER), }; - u64 capacity = 0; - int i; if (cmd->size_out < sizeof(id)) return -EINVAL; - for (i = 0; i < 2; i++) { - struct resource *res; - - res = platform_get_resource(pdev, IORESOURCE_MEM, i); - if (!res) - break; - - capacity += resource_size(res) / CXL_CAPACITY_MULTIPLIER; + memcpy(cmd->payload_out, &id, sizeof(id)); - if (le64_to_cpu(id.partition_align)) - continue; + return 0; +} - if (res->desc == IORES_DESC_PERSISTENT_MEMORY) - id.persistent_capacity = cpu_to_le64( - resource_size(res) / CXL_CAPACITY_MULTIPLIER); - else - id.volatile_capacity = cpu_to_le64( - resource_size(res) / CXL_CAPACITY_MULTIPLIER); - } +static int mock_partition_info(struct cxl_dev_state *cxlds, + struct cxl_mbox_cmd *cmd) +{ + struct cxl_mbox_get_partition_info pi = { + .active_volatile_cap = + cpu_to_le64(DEV_SIZE / 2 / CXL_CAPACITY_MULTIPLIER), + .active_persistent_cap = + cpu_to_le64(DEV_SIZE / 2 / CXL_CAPACITY_MULTIPLIER), + }; - id.total_capacity = cpu_to_le64(capacity); + if (cmd->size_out < sizeof(pi)) + return -EINVAL; - memcpy(cmd->payload_out, &id, sizeof(id)); + memcpy(cmd->payload_out, &pi, sizeof(pi)); return 0; } @@ -221,6 +221,9 @@ static int cxl_mock_mbox_send(struct cxl_dev_state *cxlds, struct cxl_mbox_cmd * case CXL_MBOX_OP_GET_LSA: rc = mock_get_lsa(cxlds, cmd); break; + case CXL_MBOX_OP_GET_PARTITION_INFO: + rc = mock_partition_info(cxlds, cmd); + break; case CXL_MBOX_OP_SET_LSA: rc = mock_set_lsa(cxlds, cmd); break; From patchwork Fri Jun 24 02:48:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893375 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63D5CC43334 for ; Fri, 24 Jun 2022 02:48:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230022AbiFXCsc (ORCPT ); Thu, 23 Jun 2022 22:48:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230392AbiFXCs3 (ORCPT ); Thu, 23 Jun 2022 22:48:29 -0400 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1236D563BD; Thu, 23 Jun 2022 19:48:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038905; x=1687574905; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=IZV2+Qzn1GFQ0O0/0eUqPJi4hlZE+XDgqXsjxKM1npc=; b=YHWTLP4i0Exq7/Tmoug+0wA5ES6QM9xYqXvSBa8qX1xP5cPL9F4x/E0H 95zaZnFKj4eVtJ1lqWeJijgcfqGAx97q0S1gudnV4UVvP86HP2cOQehYB GArs0dCnxzX/wSr7GcvOGF1eY0ABzXGFzRO0DwIyR0M1Bf8U4foJY06Dq acbxMqxlIfBzMY5ot+TBwMqkQ2oXzU38BVBS9YXAJCLjSAX3gGXfpoyAS C3LemvVjk+d5cbCwp7BkLP+aO2Z6VfrB/gHne644U5Dswj9c5oZUwZJVj LILQME32hUEoeLEMY0VjVHT7D3fnCoURhRhPcylqojAFjUrlaiENKHP91 A==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="342592439" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="342592439" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:48:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="678352815" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by FMSMGA003.fm.intel.com with ESMTP; 23 Jun 2022 19:48:24 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:48:23 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:48:23 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.102) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:48:23 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PFPHcIkDeY+4UtU3zC94nboPXRO6jmltJVINWrYoA9sUN2LzEACR9ZUBacB88AMTQF/stWwApEtud9pmBDJMuxs6kP9ACxO7DGGMBS+X65iWcgcYBFeX1+wfnshVV7MNHn5qghVZ2coQfWJZHw3AHkTkxauBksbVdeKMAIZ6pfOYJKzQRjRDY4ibuYYP6HjOEedZ1t78c5j6A+2IbDrkSjE3Z5iY+FW6w03AW42cI+NdEYVlqA53G0fFyHa6+1TUcTsk5GDE9WSUpDjO7Xu+ZcTFv7B4apFdnu68igNZQckMP9cqra7hy7+vVUra+7DlCFQuWTLDmbsfElPYnoKHYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=AfCXqxN3oa0+Nv2NlwubJnhY3OlRpK2UjchkPbMmD3Y=; b=iVrzpA+kONmqwNNzbhvC5y4gCaB52Lwqk0Nv4VlOPObQ5bpb2mlEyjNYRpikLTj8rxl85sPxiidvLpezrmQbwv91C7IKBPmvaSjOaQK0fvzc89yit0txuA4wWH7y3wit0BK89OtOTFm7KuShnuNyqLqIqU2xGf7x1o2d/CIxxc4vkJFrkMSe/+bGWo0mkZvSPa5KDdQpbagOsEFnZuYRUMkQxecmi3Fw7P9e9iFK92zie3QzNBsw8T6lmBDx6TYe6I0e8u4M9VK+HV4IxYePyy1eQCVrt4uLKeoXHblu95tWZtLUr2aUsOH7MXJ8lIXGpWwCfgeSiyFRCuypA3FwSg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BN6PR11MB1876.namprd11.prod.outlook.com (2603:10b6:404:ff::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15; Fri, 24 Jun 2022 02:48:21 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:48:19 +0000 Date: Thu, 23 Jun 2022 19:48:01 -0700 From: Dan Williams To: CC: , , , , Subject: [PATCH 24/46] tools/testing/cxl: Fix decoder default state Message-ID: <165603888091.551046.6312322707378021172.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MWHPR02CA0002.namprd02.prod.outlook.com (2603:10b6:300:4b::12) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: be69c194-6c30-4d95-7bf7-08da558bf4d8 X-MS-TrafficTypeDiagnostic: BN6PR11MB1876:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UmEQXnvIOKEH9qbDwC/EJk4UJbkOOju1AIvfMJ2Z4zTp3vV1IFGGIRu1Ls40EiJRSd4a9QzWLgR16fWiqzrk5SVfHGcTSf3vaaUdVRWWTQdhyc225sFPZnEd0cOHwIZ7yayiMdoDU6UuOl/E1sBTEPBBx+Dpyzb7aus8D2z/LqSJEeXKDjjO/jKLcWF3mL7S2qW3dgukmu9eypKaQC6zCllWelq7C+d1xjxkhdtDWBh8XX3d8dw8ZmeCEAnlhvVC4PqkI3vQbBd55Pjm0/AQYhcG/b4LEUZ4bv3N1RkQI8vtkb6VB54zsOW7OW5FTQYViytMIulatMqvR18PL4Y1wzZ7Ii/5PUPml7rgzo44U1d6J0BryUAUkYaUv+OUsVc2v/VmrsFwhF/RaSk3L7KiyAr1qEGMK6Jb9eFVgkJY9pDlTibh3zx1LExHXVMRYsbMB91Uln5ymsH+z/HpipDaMPPVQZwulMfaLVlqDh9pFYEJZCzoybo7xVZXwbAYK3+kdD0KuDBhlcPL9qjFUhyczWkp6/R6h7EhLNxdcO6CmHcvvd5ushtNL5j0p+zNRJ5YSgf5wqHHVpVOqCsJMW50sVkZlwOge7rkO/vhoMjU2j706oMEp5EfxbWy35NjGyCK5SHNZhdvLXuRKtn1skHZnXxcPR3LZ5Qh4Vzq44Zabdm/bHX1LceJkv7N7Kw4vl9A4XVKXlEisRf3bqpnzgQJL5D5Fduf1ZbmpdCtg1s3x0ROjd6fNB2Cr/Xuk0KmFzEL X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(346002)(39860400002)(376002)(136003)(396003)(366004)(103116003)(9686003)(6916009)(316002)(5660300002)(6666004)(66476007)(2906002)(86362001)(41300700001)(26005)(82960400001)(6486002)(6512007)(478600001)(66556008)(38100700002)(83380400001)(6506007)(186003)(4326008)(66946007)(33716001)(8676002)(4744005)(8936002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Sb1KjrlY0lW8h/XlciBzfBysMDCaQU1dEeUKh9zmeZMx0bcWwdktCMbVUuMa4NqRA/mFr/VzziWDPSt29ExFY4GueAKOsiht7ZILfXHHb4iYSR40LekRq06dbNqSStgvo2kTmCOG6674ouLBbr5/6nm/ks4RNG2lHs8ESz6bbQOxMzizYDu0yqaee7mpR1mfF9uytakHWAWY2gAL26C5Kw4MiPL31DGqs0OB+obW1jB2pG5DJ7x4NFlvlgH0r+TlT1PcQTRFmVdCbacCQCNo03ZHIONrHGuivrAeT0r1Z6U3iMJbqVOX7V6xwSrKQ80Ch3OpOnNnND7NL4DzcrrzfG/gfVYbSqqUg+tXlvTpuMRrNqMjAZryPDC6d/z1e3rT9EjzjNbUUeCB9DjM6/HhIww0CWdztQwMdRZ6ZrmmrhqBdJi/IGKnyCjMNnwUspczHtiNqvpFCgXeaa0edB6DOUznsPrUU2GRLseFnR7dDLh3r2nwPeBlYs9nzuxVX2pjQuc8qtwadrs0h/hm5STh0rOxdwglGbZnzOjKKGO0PNNOG8ufsln8968adsLX+CZTNJtBHCTctnu4s87R3kEJmfVHtGT16QPgRA9bsxMWRon+/02oiqr9aWb4GzO55sjRwHdMuVS5MuRjWZOGMmLvaks9dzDHfLcBqp3F4+gvKystOgmrVMeZRkwoMqg3KNhR1yfLM7ZrgTYuNy8Ug19uetUCc27n8trybrmPpQ7sxYqhqdS0RtvK0Ow1mHyu9P4OoRXbslDikcvl24PkMKhH3ARQYqWymljI0qHTjOcyZ0P90Gv+0wfzWX1fEzw6p/UK8Txyma4gXW7H9eZfuNeIlpHz1oxI0tEvFpdsKNmvXmq40tx4BD4dYvUty+T8shodeK16FhtYRgIbLDRAHpBcRS0+Q62SAk9dw8PVfiztz0ACjsgXXWtwbvlA/3ZlaGzgJwv1QRYqsB1M55HVh20qLp/gOkrHQxD4x9jDKOdXkgUqFaAMVHhcVpIBqpCvui7jTm4HR0zGkA/hIZ3kZIIlj+CHAbMaOhg9pjEV4JWwhxMUsJIiH1NMycy+2NnKdWiptB1bnXkwFZlc5allDpcMxxz+ZRCgUOVmXeDO2kzYgXRdei0wg3ga94iZp/eWTTBbiXetIuA9kXrHNZHkzU7wnTlwJYLO/W23yLGwqT5TZbs6IkccLwNYeer3UQGVqwD6eMBqW3mswajd9Uzj0bCi4G6iHfwc6IkYDH6YPm1VSy0bTrCXMwQ+nu7LITOLcviSfHs1zZu2EqoqLy5h3LvLUbi9BLgKyurhNJxQhURNqjsA7PkQGlrK4dxvdffeE92cL0ug930I18g4NppFh936TnLhyFz6herJ8Hfvc7u8MtfrQERRtWN+v3yPcWq6ZGTum/oPQSO12L8OjqoT54Sw68SbhV6aSbdn0sjProLd7Z8+eMkGHP7eeODKfntBxpuNhNvJgDvOqPIAJTi7fgHfh9q+9oYRcGiNmu3BcCt1hPeHumodeXh5JpL2cNuZ9ON1Irp2aIXeqiMfd02rvZjr0744v7Z6iBZXMjHRwAIPzfjplBhX0BDtArddzWtvPH7zxVxdWlyQG0oif5JNreFaPQ== X-MS-Exchange-CrossTenant-Network-Message-Id: be69c194-6c30-4d95-7bf7-08da558bf4d8 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:48:02.4395 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3H8aJu9DYhTQ0WsqqidoIs8Ao9oQP2E8UXiFCNS1FetG8+lgGQBT9JdNSuvFfkm385g+dAcpz0Efbm/VcNWti2kQf/kMnZDmPmh3DuupBbQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1876 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The 'enabled' state is reserved for committed decoders. By default, cxl_test decoders are uncommitted at init time. Fixes: 7c7d68db0254 ("tools/testing/cxl: Enumerate mock decoders") Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- tools/testing/cxl/test/cxl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c index c396f20a57dd..51d517fa62ee 100644 --- a/tools/testing/cxl/test/cxl.c +++ b/tools/testing/cxl/test/cxl.c @@ -479,7 +479,6 @@ static int mock_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) .end = -1, }; - cxld->flags = CXL_DECODER_F_ENABLE; cxld->interleave_ways = min_not_zero(target_count, 1); cxld->interleave_granularity = SZ_4K; cxld->target_type = CXL_DECODER_EXPANDER; From patchwork Fri Jun 24 02:48:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893376 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8AB30C433EF for ; Fri, 24 Jun 2022 02:48:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229852AbiFXCsg (ORCPT ); Thu, 23 Jun 2022 22:48:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229800AbiFXCsf (ORCPT ); Thu, 23 Jun 2022 22:48:35 -0400 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E3285D103; Thu, 23 Jun 2022 19:48:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656038913; x=1687574913; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=BK7Lmh+TW+KuoD+jkDCWgYnfc7Ds2V2TW7nI4ggT+0Y=; b=VnoZOAwcebny6dnPwVFPA9ctC9nXV/5LwIvi58nXGTwM3wzDAVnoORjY OYemStoZOsqw0GGXFS71/rbYkApXoZVMWmlN9qN1h9QFM7BS+c+0F9q9D +W/Ez35Cy/rg/VtAlbD9hGLcU+SNFfsI6UnGd3bwQBCM3RSZK+X10i11H A6o6WzyjDg++ECVukBTzssPijHTFEuqUx6+WY3IOd8AQEfXgrVYkpcg69 Nxdie6iua+q2DGQ7F5cc5Q5z0igqnuh65KNb3D4BRqWz8d7Ugmx/pEG8p hw1pb1PrRANuBGLvqKhZNsH+/8TngIjVpgxL+O7FjizZPWVJZiW0yx/6C A==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="281986624" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="281986624" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:48:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="586414218" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orsmga007.jf.intel.com with ESMTP; 23 Jun 2022 19:48:32 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:48:32 -0700 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 23 Jun 2022 19:48:32 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 23 Jun 2022 19:48:32 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.108) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 23 Jun 2022 19:48:31 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EdRms7EfRIpp/wThe400xupEpeHFaq30YpE5R2pYenz4UUp1jYmHj6I644rNtVTBboLeiI0pwX3kMuL+sKWDg4NEsokJv218+I+Hjm6WqUhuGo5SE9fqUTFpFO2hZpxE+8nEBMnv849FsQTkw0SXOdVofhiK5hNUlYdcuX8mItYIwIg8UIx9yYI9pq7xd1SjhqHW69sgZ/ssKwdAksm4uN0NTCljplC7+sVHf0MkH7U5nyFRoNmMePWNQHr11+tNP3ZnjkKMYaZSET1RqafZ0zA7VkKtmMQx/iFHn2ylqYBviE5fOqZHi4G6HLreQr3cm8ImqFXWd3PJJWv6lylu1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wnUc1e8up8Ll7zTD2OMdjn0ASnEOq76sIVLkciQIti0=; b=RoqU58/aar9lXj1If+aYescSPawFNJ7KodzwxKw9DJDUGog87DYjOQAigRYQRAwtqa4uUKU5TTcnLmZvSNf6/H9iqnS4eTCWgEGzMXKXcERc21onK1RAEI1rhsme+DSmzzNFb4ypEbuCGBPiUN2XZl23s9zIgNm9O5ezVxLM4GDKlaMPp8/G+gsN8fm2ZTqoWQ3ITmy6QahmF2eKOa4hUuqZ7m6xfB3W5PkKJG0npwqo5qvoFasDaMuWP9AT9Okiktz6qnwGGATwTww5ePLYCJlFdBnkR8cIiixY/rlee/Ro8ajLSrl9K3SHLwzytRJR4isH1bkFt28QdVjmGiXPAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) by BN6PR11MB1876.namprd11.prod.outlook.com (2603:10b6:404:ff::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15; Fri, 24 Jun 2022 02:48:25 +0000 Received: from MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf]) by MWHPR1101MB2126.namprd11.prod.outlook.com ([fe80::f50c:6e72:c8aa:8dbf%7]) with mapi id 15.20.5353.022; Fri, 24 Jun 2022 02:48:25 +0000 Date: Thu, 23 Jun 2022 19:48:07 -0700 From: Dan Williams To: CC: , , , , Subject: [PATCH 25/46] cxl/port: Record dport in endpoint references Message-ID: <165603888756.551046.17250550519692729454.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> Content-Disposition: inline In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> User-Agent: StGit/0.18-3-g996c X-ClientProxiedBy: MW4PR04CA0147.namprd04.prod.outlook.com (2603:10b6:303:84::32) To MWHPR1101MB2126.namprd11.prod.outlook.com (2603:10b6:301:50::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 84417fa5-4308-4e7a-babf-08da558bf8ff X-MS-TrafficTypeDiagnostic: BN6PR11MB1876:EE_ X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wLWAakmekN7u2EH1HIifGc5th2gbebI+u/mxqC57KxWrbloPdmm5IXNjf5kC9Am2qSySQiCUwRtiXj8h/R0jk8gIE1pWSLSJ+2SttIQYD67/T4M1iWHaUE1p46jWbMERMKpyfQeRgs47nIwCH7SyavICBTsk1abSxKximOAP5eoJU8HvhDpyTKu1AlYJIcBFaaEyBmtXcyH9v8N01s4wiYxSuf0rXchL0ovq38AOWxqxvJplg7aVuP7EOqSwricSbHVADJa7IZqN3fu9sngjLiNtBxQd7xwMZgmupLk/640cqnW0BEkZjn2jtQ5hjeGYiy24AZxi4i45x3Tgs+1pvqiUhjfu7+oJpiZSUfKAOzSWzM1pn5TlWruO9Tfjl3jL9mv/cWPRHwDPMLCx8HXUd3SgWSdvqAWN8W0s5F6KtZ7AVd0j/QKqvRLzE+ZxJb0Uf/Lbx2Rd7aOO+VIYwBRFlS/mU7RQyJkAktoIaqxTsB4zF30gvtUk7mIITpQ2Y8aSEB2ebnegN6ei3jNmqRmA+hlcCgQwMXStlqZN+ph7IpTOQCeVBWiwWTw/n72oz4bsfSw1ZDKA3sxu9jxTpnbUmX9WamJs/5dMtwflAD/88YknLqgyBSbOPqWEp7ayuqacHjs8JV9m/v6y6rpveTrh3igLVF3tql0KebKTLLb/BAYc2ZOxBeYxVdLipAyb33iEwRokvX6uVvl3wM0/FIRTwlIws8PQdRj+8USoSFs9HzFOmi6fpVSf28X2+XyKqYGt X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2126.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(7916004)(346002)(39860400002)(376002)(136003)(396003)(366004)(103116003)(9686003)(6916009)(316002)(5660300002)(6666004)(66476007)(2906002)(86362001)(41300700001)(26005)(82960400001)(6486002)(6512007)(478600001)(66556008)(38100700002)(83380400001)(6506007)(186003)(4326008)(66946007)(33716001)(8676002)(8936002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nMtb7z+xtd5zr8JXjO0hWs5oJ0qVsN9iphvbnJk1Xbqf964LeGFP7p0BeZ7qXpSGfhhuJrWQPUWJ/lylo2UhQS43omXGRmlESC2nFETbA1SDEOjZAgQNMuoS4RWkHkb36Tapr5Pr+jBqfLvMTVx4t+jl/ZzBwQsKmhXRF47i3BdwBbzpqg8FLQZRKZeurnDO8BR9iZfFm+RwUTmU0idlO2lOanKy63sQNNtXsjo1CPMRQxEzoKvgGpIij+sYM9WMR8Skf8zAL2F41QP+VFo38Jiv/w0ju4kXPdLYj3sCpVKfY+G+79FY+rpVHzCDUeed4hU8Fqk4muRlgSAtwg1lYAljqGboAf8EXrHUlxEKkL0hD0sEyKpZBDX4ZwP/gS43w53UxcdOYHm3C4m7hlr2FlmWhqdozYtyG4hkcxTmnUXC6EYnNUvvQ5xozRRJfzZY3W8/j+5cviN3t0k0af6hxUETPhvjKanb/AW2h8GivQmgAO3YzZLjZ5zsYB+AzDqwRGcS4nzNt7kmifHmxBu+iboJBkb3mNiasr50USsWP35FlJ1GTVR8zkCKfTRdwA+lxw72ylVtAhUcvrKCM49N10gC+j6ISz0QS3qhnMi5DiEl1YdAA5dEI4Yp/0xTIz3ibTGvysyZFr7VuTgAOQGOBOfvMzrVDNzzTms9IDSZ4Vh0G8UyqUhDU2x6glx+brPiBGgxhvMoJYAp1Y1emwQZH2dWrXuqW1te38yxCfQQCn8keuegqvtKmiS8deja8TxcENiz6dbwlhrWNx/EG62OJmhHVgbNxAjS4jv92WEek5ym7LGmfkGy7EHrjRu0fyWJO5r1qlPCb857ipbSbitWFSazezPqssmGdN9dlLnWqbIdA0iNCQSE/pOOWzDWfMymM38+SazvXdZ0WL6BGxOBI0lxNIsbSjjg9zVEXYkk7tBRn8Yh3MQSoAZrJ74f1VsOcJ4ivQBeFAtiPQMb2JYSBLI7a9YescFH04FFarpZJYdXv2flSvGMh8QhCZf8XMPikmXBtIIgo0A6b01xELzVqgUQ6JgKghbP++MLKxMKcNr7x7bdMQVoIWRl2rgy+u8srzrbgIShKTG0t16MreS2RG2vzBq7ydONQ79XI8vfkolmLiRCOAMJP5z5X8y0diXvwX0g0/KUuVIuc+xbLghZTupoR5UpgbSk6Q5RBTmNpXL7GnRAypHY6AXXso3nK4+ksAPpYaXe7Qeo9MS8gGoDFO3XfpXwIYfaBnDHBd3hKFD95IPogCXJ3wzAvxc3yGXnGKJpX+NVTtMSmGrytcGWGKMnyO59b/1jCJgrRo3XUFlUh8U3H4svdj5O7EWG27EBUHHpEXnDy39rUfbVF8HA34JPgRJHG8tOkU3sRO3loLnOJB5ZECNXb4BFd1AInqh4J/a38v+lQvc1YZjm9a9/1aSCmd9xn3tLcwoi3LplwuIMsNP3QDFNbtrOOC7fvEho7UsnZMjrXcBho02yHu52aF11yqYjHJ0pJB17JDX+9/BmqNT1lW9gpjhGQJBBGDEtxcKIZ2u1BRXmkT6b35qznmHQchs4atyfsE4+OwGcW3rxLhW+5gG4RURCb5MTBtisfvAHK8fNkkw7LQ0pS+lF3A== X-MS-Exchange-CrossTenant-Network-Message-Id: 84417fa5-4308-4e7a-babf-08da558bf8ff X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2126.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jun 2022 02:48:09.3920 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6A8Ffnye5NSr7E3C6ZfHhH5vq9lxxsuwowzhmFFEJe3os4rbGVGQqBH/aSJcbW0KWg0wKVegiBZ2dmpdhEHCgXhHatc9smk8NCYqd9ORoYg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1876 X-OriginatorOrg: intel.com Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Recall that the primary role of the cxl_mem driver is to probe if the given endoint is connected to a CXL port topology. In that process it walks its device ancestry to its PCI root port. If that root port is also a CXL root port then the probe process adds cxl_port object instances at switch in the path between to the root and the endpoint. As those cxl_port instances are added, or if a previous enumeration attempt already created the port a 'struct cxl_ep' instance is registered with that port to track the endpoints interested in that port. At the time the cxl_ep is registered the downstream egress path from the port to the endpoint is known. Take the opportunity to record that information as it will be needed for dynamic programming of decoder targets during region provisioning. Signed-off-by: Dan Williams --- drivers/cxl/core/port.c | 52 ++++++++++++++++++++++++++++++++--------------- drivers/cxl/cxl.h | 2 ++ 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 4e4e26ca507c..c54e1dbf92cb 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -866,8 +866,9 @@ static struct cxl_ep *find_ep(struct cxl_port *port, struct device *ep_dev) return NULL; } -static int add_ep(struct cxl_port *port, struct cxl_ep *new) +static int add_ep(struct cxl_ep *new) { + struct cxl_port *port = new->dport->port; struct cxl_ep *dup; device_lock(&port->dev); @@ -885,14 +886,14 @@ static int add_ep(struct cxl_port *port, struct cxl_ep *new) /** * cxl_add_ep - register an endpoint's interest in a port - * @port: a port in the endpoint's topology ancestry + * @dport: the dport that routes to @ep_dev * @ep_dev: device representing the endpoint * * Intermediate CXL ports are scanned based on the arrival of endpoints. * When those endpoints depart the port can be destroyed once all * endpoints that care about that port have been removed. */ -static int cxl_add_ep(struct cxl_port *port, struct device *ep_dev) +static int cxl_add_ep(struct cxl_dport *dport, struct device *ep_dev) { struct cxl_ep *ep; int rc; @@ -903,8 +904,9 @@ static int cxl_add_ep(struct cxl_port *port, struct device *ep_dev) INIT_LIST_HEAD(&ep->list); ep->ep = get_device(ep_dev); + ep->dport = dport; - rc = add_ep(port, ep); + rc = add_ep(ep); if (rc) cxl_ep_release(ep); return rc; @@ -913,11 +915,13 @@ static int cxl_add_ep(struct cxl_port *port, struct device *ep_dev) struct cxl_find_port_ctx { const struct device *dport_dev; const struct cxl_port *parent_port; + struct cxl_dport **dport; }; static int match_port_by_dport(struct device *dev, const void *data) { const struct cxl_find_port_ctx *ctx = data; + struct cxl_dport *dport; struct cxl_port *port; if (!is_cxl_port(dev)) @@ -926,7 +930,10 @@ static int match_port_by_dport(struct device *dev, const void *data) return 0; port = to_cxl_port(dev); - return cxl_find_dport_by_dev(port, ctx->dport_dev) != NULL; + dport = cxl_find_dport_by_dev(port, ctx->dport_dev); + if (ctx->dport) + *ctx->dport = dport; + return dport != NULL; } static struct cxl_port *__find_cxl_port(struct cxl_find_port_ctx *ctx) @@ -942,24 +949,32 @@ static struct cxl_port *__find_cxl_port(struct cxl_find_port_ctx *ctx) return NULL; } -static struct cxl_port *find_cxl_port(struct device *dport_dev) +static struct cxl_port *find_cxl_port(struct device *dport_dev, + struct cxl_dport **dport) { struct cxl_find_port_ctx ctx = { .dport_dev = dport_dev, + .dport = dport, }; + struct cxl_port *port; - return __find_cxl_port(&ctx); + port = __find_cxl_port(&ctx); + return port; } static struct cxl_port *find_cxl_port_at(struct cxl_port *parent_port, - struct device *dport_dev) + struct device *dport_dev, + struct cxl_dport **dport) { struct cxl_find_port_ctx ctx = { .dport_dev = dport_dev, .parent_port = parent_port, + .dport = dport, }; + struct cxl_port *port; - return __find_cxl_port(&ctx); + port = __find_cxl_port(&ctx); + return port; } /* @@ -1044,7 +1059,7 @@ static void cxl_detach_ep(void *data) if (!dport_dev) break; - port = find_cxl_port(dport_dev); + port = find_cxl_port(dport_dev, NULL); if (!port) continue; @@ -1119,6 +1134,7 @@ static int add_port_attach_ep(struct cxl_memdev *cxlmd, struct device *dparent = grandparent(dport_dev); struct cxl_port *port, *parent_port = NULL; resource_size_t component_reg_phys; + struct cxl_dport *dport; int rc; if (!dparent) { @@ -1132,7 +1148,7 @@ static int add_port_attach_ep(struct cxl_memdev *cxlmd, return -ENXIO; } - parent_port = find_cxl_port(dparent); + parent_port = find_cxl_port(dparent, NULL); if (!parent_port) { /* iterate to create this parent_port */ return -EAGAIN; @@ -1147,13 +1163,14 @@ static int add_port_attach_ep(struct cxl_memdev *cxlmd, goto out; } - port = find_cxl_port_at(parent_port, dport_dev); + port = find_cxl_port_at(parent_port, dport_dev, &dport); if (!port) { component_reg_phys = find_component_registers(uport_dev); port = devm_cxl_add_port(&parent_port->dev, uport_dev, component_reg_phys, parent_port); + /* retry find to pick up the new dport information */ if (!IS_ERR(port)) - get_device(&port->dev); + port = find_cxl_port_at(parent_port, dport_dev, &dport); } out: device_unlock(&parent_port->dev); @@ -1163,7 +1180,7 @@ static int add_port_attach_ep(struct cxl_memdev *cxlmd, else { dev_dbg(&cxlmd->dev, "add to new port %s:%s\n", dev_name(&port->dev), dev_name(port->uport)); - rc = cxl_add_ep(port, &cxlmd->dev); + rc = cxl_add_ep(dport, &cxlmd->dev); if (rc == -EEXIST) { /* * "can't" happen, but this error code means @@ -1197,6 +1214,7 @@ int devm_cxl_enumerate_ports(struct cxl_memdev *cxlmd) for (iter = dev; iter; iter = grandparent(iter)) { struct device *dport_dev = grandparent(iter); struct device *uport_dev; + struct cxl_dport *dport; struct cxl_port *port; if (!dport_dev) @@ -1212,12 +1230,12 @@ int devm_cxl_enumerate_ports(struct cxl_memdev *cxlmd) dev_dbg(dev, "scan: iter: %s dport_dev: %s parent: %s\n", dev_name(iter), dev_name(dport_dev), dev_name(uport_dev)); - port = find_cxl_port(dport_dev); + port = find_cxl_port(dport_dev, &dport); if (port) { dev_dbg(&cxlmd->dev, "found already registered port %s:%s\n", dev_name(&port->dev), dev_name(port->uport)); - rc = cxl_add_ep(port, &cxlmd->dev); + rc = cxl_add_ep(dport, &cxlmd->dev); /* * If the endpoint already exists in the port's list, @@ -1258,7 +1276,7 @@ EXPORT_SYMBOL_NS_GPL(devm_cxl_enumerate_ports, CXL); struct cxl_port *cxl_mem_find_port(struct cxl_memdev *cxlmd) { - return find_cxl_port(grandparent(&cxlmd->dev)); + return find_cxl_port(grandparent(&cxlmd->dev), NULL); } EXPORT_SYMBOL_NS_GPL(cxl_mem_find_port, CXL); diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index d8edbdaa6208..e654251a54dd 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -363,10 +363,12 @@ struct cxl_dport { /** * struct cxl_ep - track an endpoint's interest in a port * @ep: device that hosts a generic CXL endpoint (expander or accelerator) + * @dport: which dport routes to this endpoint on this port * @list: node on port->endpoints list */ struct cxl_ep { struct device *ep; + struct cxl_dport *dport; struct list_head list; }; From patchwork Fri Jun 24 04:19:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893648 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD3E2CCA473 for ; Fri, 24 Jun 2022 04:20:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229585AbiFXEUL (ORCPT ); Fri, 24 Jun 2022 00:20:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229478AbiFXEUK (ORCPT ); Fri, 24 Jun 2022 00:20:10 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88E6141339; Thu, 23 Jun 2022 21:20:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044409; x=1687580409; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=doqMnMZaLZqXI5lHzZ/n37xKfTdx3Elte7spEgmJPmE=; b=axVhHs0Yj8an2aC2iYNqNnxqjrNINMB89TjM/acxXYbh0hyQJDMTLIJ4 O/e8MM2IC4xXh8cX854ibId+0fuhuwLJdjFhC9xQ2pfsT5UoPw7DRflkR sgKFQN7UjiifD8W1/aCefhG6WXipP+DvbesozH7QUnpbTwvpu2fkeApDT wWV+VQFJsmc4UmzQq+ZGw55P7UQRQPdvQU6U80FZM6LpqDNVPWcsx6fEM CnQaKUq0ppf+DLTVl9w4grkH5wExrkapGskqNl+aUq/dPuLDPx4GXMdWm W/67QhEtY4q2U4aa9dXmeOFyUBI9JlMabYj9SpNopAaNgIOjS53EaQMKt Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367237992" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367237992" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:09 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092896" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:08 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Dan Williams Subject: [PATCH 26/46] cxl/port: Record parent dport when adding ports Date: Thu, 23 Jun 2022 21:19:30 -0700 Message-Id: <20220624041950.559155-1-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org At the time that cxl_port instances are being created, cache the dport from the parent port that points to this new child port. This will be useful for region provisioning when walking the tree to calculate decoder targets, and saves rewalking the dport list after the fact to build this information. Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- drivers/cxl/acpi.c | 3 +-- drivers/cxl/core/port.c | 30 +++++++++++++++++------------- drivers/cxl/cxl.h | 7 +++++-- drivers/cxl/mem.c | 10 ++++++---- 4 files changed, 29 insertions(+), 21 deletions(-) diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c index 5972f380cdf2..09fe92177d03 100644 --- a/drivers/cxl/acpi.c +++ b/drivers/cxl/acpi.c @@ -212,8 +212,7 @@ static int add_host_bridge_uport(struct device *match, void *arg) if (rc) return rc; - port = devm_cxl_add_port(host, match, dport->component_reg_phys, - root_port); + port = devm_cxl_add_port(host, match, dport->component_reg_phys, dport); if (IS_ERR(port)) return PTR_ERR(port); dev_dbg(host, "%s: add: %s\n", dev_name(match), dev_name(&port->dev)); diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index c54e1dbf92cb..8f53f59dd0fa 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -526,7 +526,7 @@ static struct lock_class_key cxl_port_key; static struct cxl_port *cxl_port_alloc(struct device *uport, resource_size_t component_reg_phys, - struct cxl_port *parent_port) + struct cxl_dport *parent_dport) { struct cxl_port *port; struct device *dev; @@ -548,9 +548,12 @@ static struct cxl_port *cxl_port_alloc(struct device *uport, * description. */ dev = &port->dev; - if (parent_port) { - dev->parent = &parent_port->dev; + if (parent_dport) { + struct cxl_port *parent_port = parent_dport->port; + port->depth = parent_port->depth + 1; + port->parent_dport = parent_dport; + dev->parent = &parent_port->dev; } else dev->parent = uport; @@ -579,24 +582,24 @@ static struct cxl_port *cxl_port_alloc(struct device *uport, * @host: host device for devm operations * @uport: "physical" device implementing this upstream port * @component_reg_phys: (optional) for configurable cxl_port instances - * @parent_port: next hop up in the CXL memory decode hierarchy + * @parent_dport: next hop up in the CXL memory decode hierarchy */ struct cxl_port *devm_cxl_add_port(struct device *host, struct device *uport, resource_size_t component_reg_phys, - struct cxl_port *parent_port) + struct cxl_dport *parent_dport) { struct cxl_port *port; struct device *dev; int rc; - port = cxl_port_alloc(uport, component_reg_phys, parent_port); + port = cxl_port_alloc(uport, component_reg_phys, parent_dport); if (IS_ERR(port)) return port; dev = &port->dev; if (is_cxl_memdev(uport)) rc = dev_set_name(dev, "endpoint%d", port->id); - else if (parent_port) + else if (parent_dport) rc = dev_set_name(dev, "port%d", port->id); else rc = dev_set_name(dev, "root%d", port->id); @@ -998,7 +1001,7 @@ static void delete_endpoint(void *data) struct cxl_port *parent_port; struct device *parent; - parent_port = cxl_mem_find_port(cxlmd); + parent_port = cxl_mem_find_port(cxlmd, NULL); if (!parent_port) goto out; parent = &parent_port->dev; @@ -1133,8 +1136,8 @@ static int add_port_attach_ep(struct cxl_memdev *cxlmd, { struct device *dparent = grandparent(dport_dev); struct cxl_port *port, *parent_port = NULL; + struct cxl_dport *dport, *parent_dport; resource_size_t component_reg_phys; - struct cxl_dport *dport; int rc; if (!dparent) { @@ -1148,7 +1151,7 @@ static int add_port_attach_ep(struct cxl_memdev *cxlmd, return -ENXIO; } - parent_port = find_cxl_port(dparent, NULL); + parent_port = find_cxl_port(dparent, &parent_dport); if (!parent_port) { /* iterate to create this parent_port */ return -EAGAIN; @@ -1167,7 +1170,7 @@ static int add_port_attach_ep(struct cxl_memdev *cxlmd, if (!port) { component_reg_phys = find_component_registers(uport_dev); port = devm_cxl_add_port(&parent_port->dev, uport_dev, - component_reg_phys, parent_port); + component_reg_phys, parent_dport); /* retry find to pick up the new dport information */ if (!IS_ERR(port)) port = find_cxl_port_at(parent_port, dport_dev, &dport); @@ -1274,9 +1277,10 @@ int devm_cxl_enumerate_ports(struct cxl_memdev *cxlmd) } EXPORT_SYMBOL_NS_GPL(devm_cxl_enumerate_ports, CXL); -struct cxl_port *cxl_mem_find_port(struct cxl_memdev *cxlmd) +struct cxl_port *cxl_mem_find_port(struct cxl_memdev *cxlmd, + struct cxl_dport **dport) { - return find_cxl_port(grandparent(&cxlmd->dev), NULL); + return find_cxl_port(grandparent(&cxlmd->dev), dport); } EXPORT_SYMBOL_NS_GPL(cxl_mem_find_port, CXL); diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index e654251a54dd..55d34b1576f1 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -325,6 +325,7 @@ struct cxl_nvdimm { * @id: id for port device-name * @dports: cxl_dport instances referenced by decoders * @endpoints: cxl_ep instances, endpoints that are a descendant of this port + * @parent_dport: dport that points to this port in the parent * @decoder_ida: allocator for decoder ids * @dpa_end: cursor to track highest allocated decoder for allocation ordering * @component_reg_phys: component register capability base address (optional) @@ -337,6 +338,7 @@ struct cxl_port { int id; struct list_head dports; struct list_head endpoints; + struct cxl_dport *parent_dport; struct ida decoder_ida; int dpa_end; resource_size_t component_reg_phys; @@ -391,11 +393,12 @@ int devm_cxl_register_pci_bus(struct device *host, struct device *uport, struct pci_bus *cxl_port_to_pci_bus(struct cxl_port *port); struct cxl_port *devm_cxl_add_port(struct device *host, struct device *uport, resource_size_t component_reg_phys, - struct cxl_port *parent_port); + struct cxl_dport *parent_dport); struct cxl_port *find_cxl_root(struct device *dev); int devm_cxl_enumerate_ports(struct cxl_memdev *cxlmd); int cxl_bus_rescan(void); -struct cxl_port *cxl_mem_find_port(struct cxl_memdev *cxlmd); +struct cxl_port *cxl_mem_find_port(struct cxl_memdev *cxlmd, + struct cxl_dport **dport); bool schedule_cxl_memdev_detach(struct cxl_memdev *cxlmd); struct cxl_dport *devm_cxl_add_dport(struct cxl_port *port, diff --git a/drivers/cxl/mem.c b/drivers/cxl/mem.c index 7513bea55145..2786d3402c9e 100644 --- a/drivers/cxl/mem.c +++ b/drivers/cxl/mem.c @@ -26,14 +26,15 @@ */ static int create_endpoint(struct cxl_memdev *cxlmd, - struct cxl_port *parent_port) + struct cxl_dport *parent_dport) { + struct cxl_port *parent_port = parent_dport->port; struct cxl_dev_state *cxlds = cxlmd->cxlds; struct cxl_port *endpoint; int rc; endpoint = devm_cxl_add_port(&parent_port->dev, &cxlmd->dev, - cxlds->component_reg_phys, parent_port); + cxlds->component_reg_phys, parent_dport); if (IS_ERR(endpoint)) return PTR_ERR(endpoint); @@ -76,6 +77,7 @@ static int cxl_mem_probe(struct device *dev) { struct cxl_memdev *cxlmd = to_cxl_memdev(dev); struct cxl_port *parent_port; + struct cxl_dport *dport; struct dentry *dentry; int rc; @@ -100,7 +102,7 @@ static int cxl_mem_probe(struct device *dev) if (rc) return rc; - parent_port = cxl_mem_find_port(cxlmd); + parent_port = cxl_mem_find_port(cxlmd, &dport); if (!parent_port) { dev_err(dev, "CXL port topology not found\n"); return -ENXIO; @@ -114,7 +116,7 @@ static int cxl_mem_probe(struct device *dev) goto unlock; } - rc = create_endpoint(cxlmd, parent_port); + rc = create_endpoint(cxlmd, dport); unlock: device_unlock(&parent_port->dev); put_device(&parent_port->dev); From patchwork Fri Jun 24 04:19:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893649 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D063BCCA480 for ; Fri, 24 Jun 2022 04:20:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229478AbiFXEUM (ORCPT ); Fri, 24 Jun 2022 00:20:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229498AbiFXEUL (ORCPT ); Fri, 24 Jun 2022 00:20:11 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6623049CBE; Thu, 23 Jun 2022 21:20:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044410; x=1687580410; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=d8ij3u11o75oSSOGptJFkUuJ7uZDU0gk5H3Gjw/F+sU=; b=S+28G0gGgiH+kNGDGC+2Ul6+KHX5MWTa6QG18Ka1V2+GSyfZTjoTmdqd lDzYPkwYQAlXKXdeXnIrnPxAWosmLkRc2+LIPCyYbQLy4Tiw/qQkass7a QdBAqtIrFyANfAib1/3veo8yzkk+qDpD1UuZVrH8LBdBuu92dHaYLeQX8 iNyFknC/zsCXUFQmyD4HXhdYVtgh3mEzI+/y7iFXu5SVhxlH234wdQcS2 JCZegJAsaw38LwoLSUaUEVd+wgCqApwg3qUTHQsKbuM4ZS6y0Whco7YCN CMyBNFXoV8bxwcY2XiyTVYwinPe9qhFZYKP3grVboI/cmGCxK9gYTQNPg g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367237996" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367237996" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:09 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092899" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:09 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Dan Williams Subject: [PATCH 27/46] cxl/port: Move 'cxl_ep' references to an xarray per port Date: Thu, 23 Jun 2022 21:19:31 -0700 Message-Id: <20220624041950.559155-2-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org In preparation for region provisioning that needs to walk the topology by endpoints, use an xarray to record endpoint interest in a given port. In addition to being more space and time efficient it also reduces the complexity of the implementation by moving locking internal to the xarray implementation. It also allows for a single cxl_ep reference to be recorded in multiple xarrays. Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- drivers/cxl/core/port.c | 60 ++++++++++++++++++++--------------------- drivers/cxl/cxl.h | 4 +-- 2 files changed, 30 insertions(+), 34 deletions(-) diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 8f53f59dd0fa..ea3ab9baf232 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -431,22 +431,27 @@ static struct cxl_switch_decoder *to_cxl_switch_decoder(struct device *dev) static void cxl_ep_release(struct cxl_ep *ep) { - if (!ep) - return; - list_del(&ep->list); put_device(ep->ep); kfree(ep); } +static void cxl_ep_remove(struct cxl_port *port, struct cxl_ep *ep) +{ + if (!ep) + return; + xa_erase(&port->endpoints, (unsigned long) ep->ep); + cxl_ep_release(ep); +} + static void cxl_port_release(struct device *dev) { struct cxl_port *port = to_cxl_port(dev); - struct cxl_ep *ep, *_e; + unsigned long index; + struct cxl_ep *ep; - device_lock(dev); - list_for_each_entry_safe(ep, _e, &port->endpoints, list) - cxl_ep_release(ep); - device_unlock(dev); + xa_for_each(&port->endpoints, index, ep) + cxl_ep_remove(port, ep); + xa_destroy(&port->endpoints); ida_free(&cxl_port_ida, port->id); kfree(port); } @@ -562,7 +567,7 @@ static struct cxl_port *cxl_port_alloc(struct device *uport, ida_init(&port->decoder_ida); port->dpa_end = -1; INIT_LIST_HEAD(&port->dports); - INIT_LIST_HEAD(&port->endpoints); + xa_init(&port->endpoints); device_initialize(dev); lockdep_set_class_and_subclass(&dev->mutex, &cxl_port_key, port->depth); @@ -858,33 +863,21 @@ struct cxl_dport *devm_cxl_add_dport(struct cxl_port *port, } EXPORT_SYMBOL_NS_GPL(devm_cxl_add_dport, CXL); -static struct cxl_ep *find_ep(struct cxl_port *port, struct device *ep_dev) -{ - struct cxl_ep *ep; - - device_lock_assert(&port->dev); - list_for_each_entry(ep, &port->endpoints, list) - if (ep->ep == ep_dev) - return ep; - return NULL; -} - static int add_ep(struct cxl_ep *new) { struct cxl_port *port = new->dport->port; - struct cxl_ep *dup; + int rc; device_lock(&port->dev); if (port->dead) { device_unlock(&port->dev); return -ENXIO; } - dup = find_ep(port, new->ep); - if (!dup) - list_add_tail(&new->list, &port->endpoints); + rc = xa_insert(&port->endpoints, (unsigned long)new->ep, new, + GFP_KERNEL); device_unlock(&port->dev); - return dup ? -EEXIST : 0; + return rc; } /** @@ -905,7 +898,6 @@ static int cxl_add_ep(struct cxl_dport *dport, struct device *ep_dev) if (!ep) return -ENOMEM; - INIT_LIST_HEAD(&ep->list); ep->ep = get_device(ep_dev); ep->dport = dport; @@ -1048,6 +1040,12 @@ static void delete_switch_port(struct cxl_port *port, struct list_head *dports) devm_release_action(port->dev.parent, unregister_port, port); } +static struct cxl_ep *cxl_ep_load(struct cxl_port *port, + struct cxl_memdev *cxlmd) +{ + return xa_load(&port->endpoints, (unsigned long)&cxlmd->dev); +} + static void cxl_detach_ep(void *data) { struct cxl_memdev *cxlmd = data; @@ -1086,11 +1084,11 @@ static void cxl_detach_ep(void *data) } device_lock(&port->dev); - ep = find_ep(port, &cxlmd->dev); + ep = cxl_ep_load(port, cxlmd); dev_dbg(&cxlmd->dev, "disconnect %s from %s\n", ep ? dev_name(ep->ep) : "", dev_name(&port->dev)); - cxl_ep_release(ep); - if (ep && !port->dead && list_empty(&port->endpoints) && + cxl_ep_remove(port, ep); + if (ep && !port->dead && xa_empty(&port->endpoints) && !is_cxl_root(parent_port)) { /* * This was the last ep attached to a dynamically @@ -1184,7 +1182,7 @@ static int add_port_attach_ep(struct cxl_memdev *cxlmd, dev_dbg(&cxlmd->dev, "add to new port %s:%s\n", dev_name(&port->dev), dev_name(port->uport)); rc = cxl_add_ep(dport, &cxlmd->dev); - if (rc == -EEXIST) { + if (rc == -EBUSY) { /* * "can't" happen, but this error code means * something to the caller, so translate it. @@ -1247,7 +1245,7 @@ int devm_cxl_enumerate_ports(struct cxl_memdev *cxlmd) * the parent_port lock as the current port may be being * reaped. */ - if (rc && rc != -EEXIST) { + if (rc && rc != -EBUSY) { put_device(&port->dev); return rc; } diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 55d34b1576f1..3d149780d724 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -337,7 +337,7 @@ struct cxl_port { struct device *uport; int id; struct list_head dports; - struct list_head endpoints; + struct xarray endpoints; struct cxl_dport *parent_dport; struct ida decoder_ida; int dpa_end; @@ -366,12 +366,10 @@ struct cxl_dport { * struct cxl_ep - track an endpoint's interest in a port * @ep: device that hosts a generic CXL endpoint (expander or accelerator) * @dport: which dport routes to this endpoint on this port - * @list: node on port->endpoints list */ struct cxl_ep { struct device *ep; struct cxl_dport *dport; - struct list_head list; }; /* From patchwork Fri Jun 24 04:19:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893650 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F6FFCCA481 for ; Fri, 24 Jun 2022 04:20:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229498AbiFXEUM (ORCPT ); Fri, 24 Jun 2022 00:20:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229543AbiFXEUL (ORCPT ); Fri, 24 Jun 2022 00:20:11 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F7544FC5E; Thu, 23 Jun 2022 21:20:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044410; x=1687580410; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1mKsed5a/9jJBg/NphGcCjKLoy55zhUA5ypPBBCq63A=; b=h1Hqq2Z8tVQyinnuI+y9Bi/j4qzg/UFkELONP7vXmMvRVAnLAIP6mnBf 7nBKXMFLyTrUps8pRkTQmK9k5QOgHd+yk7swcmnLWU8NwGze/0xUwI8kI lmwxOuKxVjXh1al9d0VLFCW4kweJoctIWtNrplxR5Ev/jNv+0aJsJ84Qz +yp4pn1UvHfVk2uxO0CY3Fel7abLwK8WGMiOCQCYpabE6no7t37VMIdXx BmVeu1vIwejavyI9GIQDtdCl/b+OzjN5VagnKja4yS4ONo083CjgymM9b EmcnVH5ONsx/VnkTvD2inG9FtEbMpi6I4Kx/UHdk1nIa/yK6iB0E7Zf53 Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367237997" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367237997" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:10 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092903" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:09 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Dan Williams Subject: [PATCH 28/46] cxl/port: Move dport tracking to an xarray Date: Thu, 23 Jun 2022 21:19:32 -0700 Message-Id: <20220624041950.559155-3-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Reduce the complexity and the overhead of walking the topology to determine endpoint connectivity to root decoder interleave configurations. Signed-off-by: Dan Williams --- drivers/cxl/acpi.c | 2 +- drivers/cxl/core/hdm.c | 6 ++- drivers/cxl/core/port.c | 88 ++++++++++++++++++----------------------- drivers/cxl/cxl.h | 12 +++--- 4 files changed, 51 insertions(+), 57 deletions(-) diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c index 09fe92177d03..92ad1f359faf 100644 --- a/drivers/cxl/acpi.c +++ b/drivers/cxl/acpi.c @@ -197,7 +197,7 @@ static int add_host_bridge_uport(struct device *match, void *arg) if (!bridge) return 0; - dport = cxl_find_dport_by_dev(root_port, match); + dport = cxl_dport_load(root_port, match); if (!dport) { dev_dbg(host, "host bridge expected and not found\n"); return 0; diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index c0164f9b2195..672bf3e97811 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -50,8 +50,9 @@ static int add_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, int devm_cxl_add_passthrough_decoder(struct cxl_port *port) { struct cxl_switch_decoder *cxlsd; - struct cxl_dport *dport; + struct cxl_dport *dport = NULL; int single_port_map[1]; + unsigned long index; cxlsd = cxl_switch_decoder_alloc(port, 1); if (IS_ERR(cxlsd)) @@ -59,7 +60,8 @@ int devm_cxl_add_passthrough_decoder(struct cxl_port *port) device_lock_assert(&port->dev); - dport = list_first_entry(&port->dports, typeof(*dport), list); + xa_for_each(&port->dports, index, dport) + break; single_port_map[0] = dport->port_id; return add_hdm_decoder(port, &cxlsd->cxld, single_port_map); diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index ea3ab9baf232..d2f6898940fa 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -452,6 +452,7 @@ static void cxl_port_release(struct device *dev) xa_for_each(&port->endpoints, index, ep) cxl_ep_remove(port, ep); xa_destroy(&port->endpoints); + xa_destroy(&port->dports); ida_free(&cxl_port_ida, port->id); kfree(port); } @@ -566,7 +567,7 @@ static struct cxl_port *cxl_port_alloc(struct device *uport, port->component_reg_phys = component_reg_phys; ida_init(&port->decoder_ida); port->dpa_end = -1; - INIT_LIST_HEAD(&port->dports); + xa_init(&port->dports); xa_init(&port->endpoints); device_initialize(dev); @@ -696,17 +697,13 @@ static int match_root_child(struct device *dev, const void *match) return 0; port = to_cxl_port(dev); - device_lock(dev); - list_for_each_entry(dport, &port->dports, list) { - iter = match; - while (iter) { - if (iter == dport->dport) - goto out; - iter = iter->parent; - } + iter = match; + while (iter) { + dport = cxl_dport_load(port, iter); + if (dport) + break; + iter = iter->parent; } -out: - device_unlock(dev); return !!iter; } @@ -730,9 +727,10 @@ EXPORT_SYMBOL_NS_GPL(find_cxl_root, CXL); static struct cxl_dport *find_dport(struct cxl_port *port, int id) { struct cxl_dport *dport; + unsigned long index; device_lock_assert(&port->dev); - list_for_each_entry (dport, &port->dports, list) + xa_for_each(&port->dports, index, dport) if (dport->port_id == id) return dport; return NULL; @@ -741,18 +739,21 @@ static struct cxl_dport *find_dport(struct cxl_port *port, int id) static int add_dport(struct cxl_port *port, struct cxl_dport *new) { struct cxl_dport *dup; + int rc; device_lock_assert(&port->dev); dup = find_dport(port, new->port_id); - if (dup) + if (dup) { dev_err(&port->dev, "unable to add dport%d-%s non-unique port id (%s)\n", new->port_id, dev_name(new->dport), dev_name(dup->dport)); - else - list_add_tail(&new->list, &port->dports); + rc = -EBUSY; + } else + rc = xa_insert(&port->dports, (unsigned long)new->dport, new, + GFP_KERNEL); - return dup ? -EEXIST : 0; + return rc; } /* @@ -779,10 +780,8 @@ static void cxl_dport_remove(void *data) struct cxl_dport *dport = data; struct cxl_port *port = dport->port; + xa_erase(&port->dports, (unsigned long) dport->dport); put_device(dport->dport); - cond_cxl_root_lock(port); - list_del(&dport->list); - cond_cxl_root_unlock(port); } static void cxl_dport_unlink(void *data) @@ -834,7 +833,6 @@ struct cxl_dport *devm_cxl_add_dport(struct cxl_port *port, if (!dport) return ERR_PTR(-ENOMEM); - INIT_LIST_HEAD(&dport->list); dport->dport = dport_dev; dport->port_id = port_id; dport->component_reg_phys = component_reg_phys; @@ -925,7 +923,7 @@ static int match_port_by_dport(struct device *dev, const void *data) return 0; port = to_cxl_port(dev); - dport = cxl_find_dport_by_dev(port, ctx->dport_dev); + dport = cxl_dport_load(port, ctx->dport_dev); if (ctx->dport) *ctx->dport = dport; return dport != NULL; @@ -1025,19 +1023,27 @@ EXPORT_SYMBOL_NS_GPL(cxl_endpoint_autoremove, CXL); * for a port to be unregistered is when all memdevs beneath that port have gone * through ->remove(). This "bottom-up" removal selectively removes individual * child ports manually. This depends on devm_cxl_add_port() to not change is - * devm action registration order. + * devm action registration order, and for dports to have already been + * destroyed by reap_dports(). */ -static void delete_switch_port(struct cxl_port *port, struct list_head *dports) +static void delete_switch_port(struct cxl_port *port) +{ + devm_release_action(port->dev.parent, cxl_unlink_uport, port); + devm_release_action(port->dev.parent, unregister_port, port); +} + +static void reap_dports(struct cxl_port *port) { - struct cxl_dport *dport, *_d; + struct cxl_dport *dport; + unsigned long index; + + device_lock_assert(&port->dev); - list_for_each_entry_safe(dport, _d, dports, list) { + xa_for_each(&port->dports, index, dport) { devm_release_action(&port->dev, cxl_dport_unlink, dport); devm_release_action(&port->dev, cxl_dport_remove, dport); devm_kfree(&port->dev, dport); } - devm_release_action(port->dev.parent, cxl_unlink_uport, port); - devm_release_action(port->dev.parent, unregister_port, port); } static struct cxl_ep *cxl_ep_load(struct cxl_port *port, @@ -1054,8 +1060,8 @@ static void cxl_detach_ep(void *data) for (iter = &cxlmd->dev; iter; iter = grandparent(iter)) { struct device *dport_dev = grandparent(iter); struct cxl_port *port, *parent_port; - LIST_HEAD(reap_dports); struct cxl_ep *ep; + bool died = false; if (!dport_dev) break; @@ -1095,15 +1101,16 @@ static void cxl_detach_ep(void *data) * enumerated port. Block new cxl_add_ep() and garbage * collect the port. */ + died = true; port->dead = true; - list_splice_init(&port->dports, &reap_dports); + reap_dports(port); } device_unlock(&port->dev); - if (!list_empty(&reap_dports)) { + if (died) { dev_dbg(&cxlmd->dev, "delete %s\n", dev_name(&port->dev)); - delete_switch_port(port, &reap_dports); + delete_switch_port(port); } put_device(&port->dev); device_unlock(&parent_port->dev); @@ -1282,23 +1289,6 @@ struct cxl_port *cxl_mem_find_port(struct cxl_memdev *cxlmd, } EXPORT_SYMBOL_NS_GPL(cxl_mem_find_port, CXL); -struct cxl_dport *cxl_find_dport_by_dev(struct cxl_port *port, - const struct device *dev) -{ - struct cxl_dport *dport; - - device_lock(&port->dev); - list_for_each_entry(dport, &port->dports, list) - if (dport->dport == dev) { - device_unlock(&port->dev); - return dport; - } - - device_unlock(&port->dev); - return NULL; -} -EXPORT_SYMBOL_NS_GPL(cxl_find_dport_by_dev, CXL); - static int decoder_populate_targets(struct cxl_switch_decoder *cxlsd, struct cxl_port *port, int *target_map) { @@ -1309,7 +1299,7 @@ static int decoder_populate_targets(struct cxl_switch_decoder *cxlsd, device_lock_assert(&port->dev); - if (list_empty(&port->dports)) + if (xa_empty(&port->dports)) return -EINVAL; write_seqlock(&cxlsd->target_lock); diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 3d149780d724..8e2c1b393552 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -336,7 +336,7 @@ struct cxl_port { struct device dev; struct device *uport; int id; - struct list_head dports; + struct xarray dports; struct xarray endpoints; struct cxl_dport *parent_dport; struct ida decoder_ida; @@ -346,20 +346,24 @@ struct cxl_port { unsigned int depth; }; +static inline struct cxl_dport *cxl_dport_load(struct cxl_port *port, + const struct device *dport_dev) +{ + return xa_load(&port->dports, (unsigned long)dport_dev); +} + /** * struct cxl_dport - CXL downstream port * @dport: PCI bridge or firmware device representing the downstream link * @port_id: unique hardware identifier for dport in decoder target list * @component_reg_phys: downstream port component registers * @port: reference to cxl_port that contains this downstream port - * @list: node for a cxl_port's list of cxl_dport instances */ struct cxl_dport { struct device *dport; int port_id; resource_size_t component_reg_phys; struct cxl_port *port; - struct list_head list; }; /** @@ -402,8 +406,6 @@ bool schedule_cxl_memdev_detach(struct cxl_memdev *cxlmd); struct cxl_dport *devm_cxl_add_dport(struct cxl_port *port, struct device *dport, int port_id, resource_size_t component_reg_phys); -struct cxl_dport *cxl_find_dport_by_dev(struct cxl_port *port, - const struct device *dev); struct cxl_decoder *to_cxl_decoder(struct device *dev); struct cxl_root_decoder *to_cxl_root_decoder(struct device *dev); From patchwork Fri Jun 24 04:19:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893651 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84C92CCA483 for ; Fri, 24 Jun 2022 04:20:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229543AbiFXEUN (ORCPT ); Fri, 24 Jun 2022 00:20:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229584AbiFXEUL (ORCPT ); Fri, 24 Jun 2022 00:20:11 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 292A44FC6A; Thu, 23 Jun 2022 21:20:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044411; x=1687580411; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HUsFMVeTjVGLdCwrcUoS1fkV2YbMF30CWyhsa214UuI=; b=HK1nvKK5EMTeGzdb72I6kVcmrTaQJu1M+XKeU+VVAehqrW+u8MxDbmo5 ytn2Y32wkgrSHww9tAV+G8xAHUf6oBzF2R3wURJvP/3N1Fo3vX+eUTglJ 9gsYkTkdjSTMV38c4z8AP6m0CDvPWt27JAarHUMqQHA8h7bVqgK5fBaK4 ObgQ77vDA6GvvM7QJBTUbDORLDeORWTreSh2vkjgctW/RXhpXWS8gwizv 4c53uqY/+24olRoW2vzfE7PmP35q3yQpUfrlbAT6zH0zNYVsru360Hr+b BPZ9wPgyib5HcWDU29Sp6Z2KTme3moTUQzyVTaNhZDamaXcEPHc0xtML/ g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367237998" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367237998" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:10 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092906" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:10 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Dan Williams Subject: [PATCH 29/46] cxl/port: Cache CXL host bridge data Date: Thu, 23 Jun 2022 21:19:33 -0700 Message-Id: <20220624041950.559155-4-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Region creation has need for checking host-bridge connectivity when adding endpoints to regions. Record, at port creation time, the host-bridge to provide a useful shortcut from any location in the topology to the most-significant ancestor. Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- drivers/cxl/core/port.c | 16 +++++++++++++++- drivers/cxl/cxl.h | 2 ++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index d2f6898940fa..c48f217e689a 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -546,6 +546,7 @@ static struct cxl_port *cxl_port_alloc(struct device *uport, if (rc < 0) goto err; port->id = rc; + port->uport = uport; /* * The top-level cxl_port "cxl_root" does not have a cxl_port as @@ -556,14 +557,27 @@ static struct cxl_port *cxl_port_alloc(struct device *uport, dev = &port->dev; if (parent_dport) { struct cxl_port *parent_port = parent_dport->port; + struct cxl_port *iter; port->depth = parent_port->depth + 1; port->parent_dport = parent_dport; dev->parent = &parent_port->dev; + /* + * walk to the host bridge, or the first ancestor that knows + * the host bridge + */ + iter = port; + while (!iter->host_bridge && + !is_cxl_root(to_cxl_port(iter->dev.parent))) + iter = to_cxl_port(iter->dev.parent); + if (iter->host_bridge) + port->host_bridge = iter->host_bridge; + else + port->host_bridge = iter->uport; + dev_dbg(uport, "host-bridge: %s\n", dev_name(port->host_bridge)); } else dev->parent = uport; - port->uport = uport; port->component_reg_phys = component_reg_phys; ida_init(&port->decoder_ida); port->dpa_end = -1; diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 8e2c1b393552..0211cf0d3574 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -331,6 +331,7 @@ struct cxl_nvdimm { * @component_reg_phys: component register capability base address (optional) * @dead: last ep has been removed, force port re-creation * @depth: How deep this port is relative to the root. depth 0 is the root. + * @host_bridge: Shortcut to the platform attach point for this port */ struct cxl_port { struct device dev; @@ -344,6 +345,7 @@ struct cxl_port { resource_size_t component_reg_phys; bool dead; unsigned int depth; + struct device *host_bridge; }; static inline struct cxl_dport *cxl_dport_load(struct cxl_port *port, From patchwork Fri Jun 24 04:19:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893652 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32195CCA487 for ; Fri, 24 Jun 2022 04:20:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229893AbiFXEUO (ORCPT ); Fri, 24 Jun 2022 00:20:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229699AbiFXEUM (ORCPT ); Fri, 24 Jun 2022 00:20:12 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D41841339; Thu, 23 Jun 2022 21:20:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044411; x=1687580411; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=E/VCq1+NrudHLCuO/gBPcz0LttvmxZzeLm4RT/jWrkY=; b=SqtlDKe1up0KFgISoY74rj/y61IaOxTV2trdCrrHu2WBFCWOKqMSWcxV bMNVCh+5FFcJ5rtDKplDZxa/5oGQ2exV8KZ52CmayFRy5sJhy1yK5kOx0 QIQMiUIVhPChAc+vFC2RyJVpZSh8n9875GtBIinUqAgJTsFusvx2O22HE 1t2FO97bUdh4GIxd61IL+q6RPFPFYjqHM1WHyqwff/CUC0hF0YHpIxnyV JJtltu9MeUJ5GePr3cgx0AtWrsk4vXjkDHXUX1Q01AXLSF9T0xiXkfOy7 kpK9bwnzIxDfdjg5PnMhfZKJjSgmnuF+vqTf80d/dhRnGzY3IzgRn/Cr1 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367238002" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367238002" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:10 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092910" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:10 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Ben Widawsky , Dan Williams Subject: [PATCH 30/46] cxl/hdm: Add sysfs attributes for interleave ways + granularity Date: Thu, 23 Jun 2022 21:19:34 -0700 Message-Id: <20220624041950.559155-5-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Ben Widawsky The region provisioning flow involves selecting interleave ways + granularity settings for a region, and then programming the decoder topology to meet those constraints, if possible. For example, root decoders set the minimum interleave ways + granularity for any hosted regions. Given decoder programming is not atomic and collisions can occur between multiple requesting regions userpace will be resonsible for conflict resolution and it needs these attributes to make those decisions. Signed-off-by: Ben Widawsky [djbw: reword changelog, make read-only, add sysfs ABI documentaion] Signed-off-by: Dan Williams --- Documentation/ABI/testing/sysfs-bus-cxl | 23 +++++++++++++++++++++++ drivers/cxl/core/port.c | 23 +++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-bus-cxl b/Documentation/ABI/testing/sysfs-bus-cxl index 85844f9bc00b..2a4e4163879f 100644 --- a/Documentation/ABI/testing/sysfs-bus-cxl +++ b/Documentation/ABI/testing/sysfs-bus-cxl @@ -215,3 +215,26 @@ Description: allocations are enforced to occur in increasing 'decoderX.Y/id' order and frees are enforced to occur in decreasing 'decoderX.Y/id' order. + + +What: /sys/bus/cxl/devices/decoderX.Y/interleave_ways +Date: May, 2022 +KernelVersion: v5.20 +Contact: linux-cxl@vger.kernel.org +Description: + (RO) The number of targets across which this decoder's host + physical address (HPA) memory range is interleaved. The device + maps every Nth block of HPA (of size == + 'interleave_granularity') to consecutive DPA addresses. The + decoder's position in the interleave is determined by the + device's (endpoint or switch) switch ancestry. + + +What: /sys/bus/cxl/devices/decoderX.Y/interleave_granularity +Date: May, 2022 +KernelVersion: v5.20 +Contact: linux-cxl@vger.kernel.org +Description: + (RO) The number of consecutive bytes of host physical address + space this decoder claims at address N before awaint the next + address (N + interleave_granularity * intereleave_ways). diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index c48f217e689a..08a380d20cf1 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -260,10 +260,33 @@ static ssize_t dpa_size_store(struct device *dev, struct device_attribute *attr, } static DEVICE_ATTR_RW(dpa_size); +static ssize_t interleave_granularity_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct cxl_decoder *cxld = to_cxl_decoder(dev); + + return sysfs_emit(buf, "%d\n", cxld->interleave_granularity); +} + +static DEVICE_ATTR_RO(interleave_granularity); + +static ssize_t interleave_ways_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct cxl_decoder *cxld = to_cxl_decoder(dev); + + return sysfs_emit(buf, "%d\n", cxld->interleave_ways); +} + +static DEVICE_ATTR_RO(interleave_ways); + static struct attribute *cxl_decoder_base_attrs[] = { &dev_attr_start.attr, &dev_attr_size.attr, &dev_attr_locked.attr, + &dev_attr_interleave_granularity.attr, + &dev_attr_interleave_ways.attr, NULL, }; From patchwork Fri Jun 24 04:19:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893653 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5B2ECCA48A for ; Fri, 24 Jun 2022 04:20:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229734AbiFXEUO (ORCPT ); Fri, 24 Jun 2022 00:20:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229755AbiFXEUM (ORCPT ); Fri, 24 Jun 2022 00:20:12 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F83649CBE; Thu, 23 Jun 2022 21:20:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044411; x=1687580411; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Kf9CFFgXOGWToq/1lPLAO9HeAEErdsvWCZKaBOcE9Vo=; b=m0J3fmfL0MEjY3i+cxbjvlW59rVYOA8B/BdKI4HaRYjVRbAEqtRfAchS RRyWTY7oC3Vqf29jdY1BZpJv84KhVgmy6pkmUHBqTwGTEUp/MnzW8VzSC 7xb5L6KmD8/NRLxNYYPuPn6RVtP/1xSamH5uqjxqPQ3F6rH7vcEi3Z3qb LgQLIMZuf93unOhKLKfnjDf7s8i2CkvWw56mvG1/6ZcuiPtOEDPIUB/OJ APmJAGL+/5SQcmBTE1SDBJDRSXFc/UnkCt/j9fMETfkS8L++RvkhlrN4w SQFJi3ofVgPiq3NFa2glSW5v2jI79ZlenvOdTmpRj9/CPmbbPqU3ZsFZ6 A==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367238003" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367238003" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:11 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092916" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:10 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Dan Williams Subject: [PATCH 31/46] cxl/hdm: Initialize decoder type for memory expander devices Date: Thu, 23 Jun 2022 21:19:35 -0700 Message-Id: <20220624041950.559155-6-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Unless and until accelerator (type-2) drivers start registering for CXL.mem mapping services from the CXL subsystem core, initialize idle HDM decoders to the "expander" type. I.e. the only CXL devices using the CXL core presently are those implementing the CXL 2.0 Type-3 memory expander device class code that the cxl_pci driver claims. Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- drivers/cxl/core/hdm.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index 672bf3e97811..7b58f6911523 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -474,6 +474,17 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, cxld->flags |= CXL_DECODER_F_ENABLE; if (ctrl & CXL_HDM_DECODER0_CTRL_LOCK) cxld->flags |= CXL_DECODER_F_LOCK; + if (FIELD_GET(CXL_HDM_DECODER0_CTRL_TYPE, ctrl)) + cxld->target_type = CXL_DECODER_EXPANDER; + else + cxld->target_type = CXL_DECODER_ACCELERATOR; + } else { + /* unless / until type-2 drivers arrive, assume type-3 */ + if (FIELD_GET(CXL_HDM_DECODER0_CTRL_TYPE, ctrl) == 0) { + ctrl |= CXL_HDM_DECODER0_CTRL_TYPE; + writel(ctrl, hdm + CXL_HDM_DECODER0_CTRL_OFFSET(which)); + } + cxld->target_type = CXL_DECODER_EXPANDER; } rc = cxl_to_ways(FIELD_GET(CXL_HDM_DECODER0_CTRL_IW_MASK, ctrl), &cxld->interleave_ways); @@ -488,11 +499,6 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, if (rc) return rc; - if (FIELD_GET(CXL_HDM_DECODER0_CTRL_TYPE, ctrl)) - cxld->target_type = CXL_DECODER_EXPANDER; - else - cxld->target_type = CXL_DECODER_ACCELERATOR; - if (!cxled) { target_list.value = ioread64_hi_lo(hdm + CXL_HDM_DECODER0_TL_LOW(which)); From patchwork Fri Jun 24 04:19:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893654 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68144CCA489 for ; Fri, 24 Jun 2022 04:20:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229932AbiFXEUP (ORCPT ); Fri, 24 Jun 2022 00:20:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229790AbiFXEUM (ORCPT ); Fri, 24 Jun 2022 00:20:12 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A26724FC6C; Thu, 23 Jun 2022 21:20:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044411; x=1687580411; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TmO5WC2sgc0jo0rcoMKAabKd56FHXClv4MSAUMadPB8=; b=LceXD7Qfk8FvZMIxuLJZAxWhdWuIXNFJ2xf3pb8D2ZXjD6ssV8aDMB1P SbtB/b5kcXVW7q3NMRSBsKATl0l2odXVFidfoVVnaBDbYaMZNYQeDh+9J i/CDEu5/5dJnifzJ4zX9KNXrjGLmX89aF9/Vm/ed52wY8WadaGnz+EDBk rtMl89ZXyfSJhZiTAwd5wM0Y1V8M6XG90YSwJmYxE+6J6YChXdk7EvrMz sFT1vyR9DbJFqz0xKo9+8AKK+wgkDX3hJo/4PXGr15KFP46Eqz0AY1yQ1 5BHe/JGKKV2n2vbKV5IyG2mSoATSF4IorjPNO884o3TFZUzB//W4GupsC g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367238004" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367238004" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:11 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092921" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:11 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Dan Williams Subject: [PATCH 32/46] cxl/mem: Enumerate port targets before adding endpoints Date: Thu, 23 Jun 2022 21:19:36 -0700 Message-Id: <20220624041950.559155-7-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The port scanning algorithm in devm_cxl_enumerate_ports() walks up the topology and adds cxl_port objects starting from the root down to the endpoint. When those ports are initially created they know all their dports, but they do not know the downstream cxl_port instance that represents the next descendant in the topology. Rework create_endpoint() into devm_cxl_add_endpoint() that enumerates the downstream cxl_port topology into each port's 'struct cxl_ep' record for each endpoint it that the port is an ancestor. Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- drivers/cxl/core/port.c | 41 +++++++++++++++++++++++++++++++++++++++++ drivers/cxl/cxl.h | 7 ++++++- drivers/cxl/mem.c | 30 +----------------------------- 3 files changed, 48 insertions(+), 30 deletions(-) diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 08a380d20cf1..2e56903399c2 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -1089,6 +1089,47 @@ static struct cxl_ep *cxl_ep_load(struct cxl_port *port, return xa_load(&port->endpoints, (unsigned long)&cxlmd->dev); } +int devm_cxl_add_endpoint(struct cxl_memdev *cxlmd, + struct cxl_dport *parent_dport) +{ + struct cxl_port *parent_port = parent_dport->port; + struct cxl_dev_state *cxlds = cxlmd->cxlds; + struct cxl_port *endpoint, *iter, *down; + int rc; + + /* + * Now that the path to the root is established record all the + * intervening ports in the chain. + */ + for (iter = parent_port, down = NULL; !is_cxl_root(iter); + down = iter, iter = to_cxl_port(iter->dev.parent)) { + struct cxl_ep *ep; + + ep = cxl_ep_load(iter, cxlmd); + ep->next = down; + } + + endpoint = devm_cxl_add_port(&parent_port->dev, &cxlmd->dev, + cxlds->component_reg_phys, parent_dport); + if (IS_ERR(endpoint)) + return PTR_ERR(endpoint); + + dev_dbg(&cxlmd->dev, "add: %s\n", dev_name(&endpoint->dev)); + + rc = cxl_endpoint_autoremove(cxlmd, endpoint); + if (rc) + return rc; + + if (!endpoint->dev.driver) { + dev_err(&cxlmd->dev, "%s failed probe\n", + dev_name(&endpoint->dev)); + return -ENXIO; + } + + return 0; +} +EXPORT_SYMBOL_NS_GPL(devm_cxl_add_endpoint, CXL); + static void cxl_detach_ep(void *data) { struct cxl_memdev *cxlmd = data; diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 0211cf0d3574..f761cf78cc05 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -371,11 +371,14 @@ struct cxl_dport { /** * struct cxl_ep - track an endpoint's interest in a port * @ep: device that hosts a generic CXL endpoint (expander or accelerator) - * @dport: which dport routes to this endpoint on this port + * @dport: which dport routes to this endpoint on @port + * @next: cxl switch port across the link attached to @dport NULL if + * attached to an endpoint */ struct cxl_ep { struct device *ep; struct cxl_dport *dport; + struct cxl_port *next; }; /* @@ -398,6 +401,8 @@ struct pci_bus *cxl_port_to_pci_bus(struct cxl_port *port); struct cxl_port *devm_cxl_add_port(struct device *host, struct device *uport, resource_size_t component_reg_phys, struct cxl_dport *parent_dport); +int devm_cxl_add_endpoint(struct cxl_memdev *cxlmd, + struct cxl_dport *parent_dport); struct cxl_port *find_cxl_root(struct device *dev); int devm_cxl_enumerate_ports(struct cxl_memdev *cxlmd); int cxl_bus_rescan(void); diff --git a/drivers/cxl/mem.c b/drivers/cxl/mem.c index 2786d3402c9e..64ccf053d32c 100644 --- a/drivers/cxl/mem.c +++ b/drivers/cxl/mem.c @@ -25,34 +25,6 @@ * in higher level operations. */ -static int create_endpoint(struct cxl_memdev *cxlmd, - struct cxl_dport *parent_dport) -{ - struct cxl_port *parent_port = parent_dport->port; - struct cxl_dev_state *cxlds = cxlmd->cxlds; - struct cxl_port *endpoint; - int rc; - - endpoint = devm_cxl_add_port(&parent_port->dev, &cxlmd->dev, - cxlds->component_reg_phys, parent_dport); - if (IS_ERR(endpoint)) - return PTR_ERR(endpoint); - - dev_dbg(&cxlmd->dev, "add: %s\n", dev_name(&endpoint->dev)); - - rc = cxl_endpoint_autoremove(cxlmd, endpoint); - if (rc) - return rc; - - if (!endpoint->dev.driver) { - dev_err(&cxlmd->dev, "%s failed probe\n", - dev_name(&endpoint->dev)); - return -ENXIO; - } - - return 0; -} - static void enable_suspend(void *data) { cxl_mem_active_dec(); @@ -116,7 +88,7 @@ static int cxl_mem_probe(struct device *dev) goto unlock; } - rc = create_endpoint(cxlmd, dport); + rc = devm_cxl_add_endpoint(cxlmd, dport); unlock: device_unlock(&parent_port->dev); put_device(&parent_port->dev); From patchwork Fri Jun 24 04:19:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893658 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1FFC0CCA48D for ; Fri, 24 Jun 2022 04:20:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230061AbiFXEUP (ORCPT ); Fri, 24 Jun 2022 00:20:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229861AbiFXEUN (ORCPT ); Fri, 24 Jun 2022 00:20:13 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 184354FC5E; Thu, 23 Jun 2022 21:20:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044412; x=1687580412; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VWqSrsF/8AtHIz6pbjjwt/1/bobrPOwTGS0iEZ53wBc=; b=g5u2xSpdrKt8bzpQdU1GFMIFuaASSgAtEFPipZ80kSJoR4BxUcrsPc+o Y2SxCR+/oOcMCUMmoGJkf6uv7s0soqW8NGCSFKomhRPtM8uN6uMKuAi9/ dhOFWQMB7/1zOON2zw0KDKlhnZGJmT+wc816ZYfvasrtyqx9ggyjMzFgY MR83K4GeqqTy7hhU3Ww5HpV1Xqa+RdyKYGOoioE1bIC7rweUpq35XWVnX aXC23rJhDfkKPlAK1J7+dCENTUc3KFkGwarrWJAV/CgnBCoo7HKJ7u+xO Uh43N52PNKSuHR3bOa5mORVfgUafLVx2eznfLlGblICSeWenSvKIzHqSu Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367238005" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367238005" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:12 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092926" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:11 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Dan Williams , Jason Gunthorpe , Matthew Wilcox , Christoph Hellwig Subject: [PATCH 33/46] resource: Introduce alloc_free_mem_region() Date: Thu, 23 Jun 2022 21:19:37 -0700 Message-Id: <20220624041950.559155-8-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The core of devm_request_free_mem_region() is a helper that searches for free space in iomem_resource and performs __request_region_locked() on the result of that search. The policy choices of the implementation conform to what CONFIG_DEVICE_PRIVATE users want which is memory that is immediately marked busy, and a preference to search for the first-fit free range in descending order from the top of the physical address space. CXL has a need for a similar allocator, but with the following tweaks: 1/ Search for free space in ascending order 2/ Search for free space relative to a given CXL window 3/ 'insert' rather than 'request' the new resource given downstream drivers from the CXL Region driver (like the pmem or dax drivers) are responsible for request_mem_region() when they activate the memory range. Rework __request_free_mem_region() into get_free_mem_region() which takes a set of GFR_* (Get Free Region) flags to control the allocation policy (ascending vs descending), and "busy" policy (insert_resource() vs request_region()). Suggested-by: Jason Gunthorpe Link: https://lore.kernel.org/linux-cxl/20220420143406.GY2120790@nvidia.com/ Cc: Matthew Wilcox Cc: Christoph Hellwig Signed-off-by: Dan Williams --- include/linux/ioport.h | 2 + kernel/resource.c | 174 ++++++++++++++++++++++++++++++++--------- mm/Kconfig | 5 ++ 3 files changed, 146 insertions(+), 35 deletions(-) diff --git a/include/linux/ioport.h b/include/linux/ioport.h index ec5f71f7135b..ed03518347aa 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -329,6 +329,8 @@ struct resource *devm_request_free_mem_region(struct device *dev, struct resource *base, unsigned long size); struct resource *request_free_mem_region(struct resource *base, unsigned long size, const char *name); +struct resource *alloc_free_mem_region(struct resource *base, + unsigned long size, unsigned long align, const char *name); static inline void irqresource_disabled(struct resource *res, u32 irq) { diff --git a/kernel/resource.c b/kernel/resource.c index 53a534db350e..9fc990274106 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -489,8 +489,9 @@ int __weak page_is_ram(unsigned long pfn) } EXPORT_SYMBOL_GPL(page_is_ram); -static int __region_intersects(resource_size_t start, size_t size, - unsigned long flags, unsigned long desc) +static int __region_intersects(struct resource *parent, resource_size_t start, + size_t size, unsigned long flags, + unsigned long desc) { struct resource res; int type = 0; int other = 0; @@ -499,7 +500,7 @@ static int __region_intersects(resource_size_t start, size_t size, res.start = start; res.end = start + size - 1; - for (p = iomem_resource.child; p ; p = p->sibling) { + for (p = parent->child; p ; p = p->sibling) { bool is_type = (((p->flags & flags) == flags) && ((desc == IORES_DESC_NONE) || (desc == p->desc))); @@ -543,7 +544,7 @@ int region_intersects(resource_size_t start, size_t size, unsigned long flags, int ret; read_lock(&resource_lock); - ret = __region_intersects(start, size, flags, desc); + ret = __region_intersects(&iomem_resource, start, size, flags, desc); read_unlock(&resource_lock); return ret; @@ -1780,62 +1781,135 @@ void resource_list_free(struct list_head *head) } EXPORT_SYMBOL(resource_list_free); -#ifdef CONFIG_DEVICE_PRIVATE -static struct resource *__request_free_mem_region(struct device *dev, - struct resource *base, unsigned long size, const char *name) +#ifdef CONFIG_GET_FREE_REGION +#define GFR_DESCENDING (1UL << 0) +#define GFR_REQUEST_REGION (1UL << 1) +#define GFR_DEFAULT_ALIGN (1UL << PA_SECTION_SHIFT) + +static resource_size_t gfr_start(struct resource *base, resource_size_t size, + resource_size_t align, unsigned long flags) +{ + if (flags & GFR_DESCENDING) { + resource_size_t end; + + end = min_t(resource_size_t, base->end, + (1ULL << MAX_PHYSMEM_BITS) - 1); + return end - size + 1; + } + + return ALIGN(base->start, align); +} + +static bool gfr_continue(struct resource *base, resource_size_t addr, + resource_size_t size, unsigned long flags) +{ + if (flags & GFR_DESCENDING) + return addr > size && addr >= base->start; + return addr > addr - size && + addr <= min_t(resource_size_t, base->end, + (1ULL << MAX_PHYSMEM_BITS) - 1); +} + +static resource_size_t gfr_next(resource_size_t addr, resource_size_t size, + unsigned long flags) +{ + if (flags & GFR_DESCENDING) + return addr - size; + return addr + size; +} + +static void remove_free_mem_region(void *_res) { - resource_size_t end, addr; + struct resource *res = _res; + + if (res->parent) + remove_resource(res); + free_resource(res); +} + +static struct resource * +get_free_mem_region(struct device *dev, struct resource *base, + resource_size_t size, const unsigned long align, + const char *name, const unsigned long desc, + const unsigned long flags) +{ + resource_size_t addr; struct resource *res; struct region_devres *dr = NULL; - size = ALIGN(size, 1UL << PA_SECTION_SHIFT); - end = min_t(unsigned long, base->end, (1UL << MAX_PHYSMEM_BITS) - 1); - addr = end - size + 1UL; + size = ALIGN(size, align); res = alloc_resource(GFP_KERNEL); if (!res) return ERR_PTR(-ENOMEM); - if (dev) { + if (dev && (flags & GFR_REQUEST_REGION)) { dr = devres_alloc(devm_region_release, sizeof(struct region_devres), GFP_KERNEL); if (!dr) { free_resource(res); return ERR_PTR(-ENOMEM); } + } else if (dev) { + if (devm_add_action_or_reset(dev, remove_free_mem_region, res)) + return ERR_PTR(-ENOMEM); } write_lock(&resource_lock); - for (; addr > size && addr >= base->start; addr -= size) { - if (__region_intersects(addr, size, 0, IORES_DESC_NONE) != - REGION_DISJOINT) + for (addr = gfr_start(base, size, align, flags); + gfr_continue(base, addr, size, flags); + addr = gfr_next(addr, size, flags)) { + if (__region_intersects(base, addr, size, 0, IORES_DESC_NONE) != + REGION_DISJOINT) continue; - if (__request_region_locked(res, &iomem_resource, addr, size, - name, 0)) - break; + if (flags & GFR_REQUEST_REGION) { + if (__request_region_locked(res, &iomem_resource, addr, + size, name, 0)) + break; - if (dev) { - dr->parent = &iomem_resource; - dr->start = addr; - dr->n = size; - devres_add(dev, dr); - } + if (dev) { + dr->parent = &iomem_resource; + dr->start = addr; + dr->n = size; + devres_add(dev, dr); + } - res->desc = IORES_DESC_DEVICE_PRIVATE_MEMORY; - write_unlock(&resource_lock); + res->desc = desc; + write_unlock(&resource_lock); + + + /* + * A driver is claiming this region so revoke any + * mappings. + */ + revoke_iomem(res); + } else { + res->start = addr; + res->end = addr + size - 1; + res->name = name; + res->desc = desc; + res->flags = IORESOURCE_MEM; + + /* + * Only succeed if the resource hosts an exclusive + * range after the insert + */ + if (__insert_resource(base, res) || res->child) + break; + + write_unlock(&resource_lock); + } - /* - * A driver is claiming this region so revoke any mappings. - */ - revoke_iomem(res); return res; } write_unlock(&resource_lock); - free_resource(res); - if (dr) + if (flags & GFR_REQUEST_REGION) { + free_resource(res); devres_free(dr); + } else if (dev) + devm_release_action(dev, remove_free_mem_region, res); return ERR_PTR(-ERANGE); } @@ -1854,18 +1928,48 @@ static struct resource *__request_free_mem_region(struct device *dev, struct resource *devm_request_free_mem_region(struct device *dev, struct resource *base, unsigned long size) { - return __request_free_mem_region(dev, base, size, dev_name(dev)); + unsigned long flags = GFR_DESCENDING | GFR_REQUEST_REGION; + + return get_free_mem_region(dev, base, size, GFR_DEFAULT_ALIGN, + dev_name(dev), + IORES_DESC_DEVICE_PRIVATE_MEMORY, flags); } EXPORT_SYMBOL_GPL(devm_request_free_mem_region); struct resource *request_free_mem_region(struct resource *base, unsigned long size, const char *name) { - return __request_free_mem_region(NULL, base, size, name); + unsigned long flags = GFR_DESCENDING | GFR_REQUEST_REGION; + + return get_free_mem_region(NULL, base, size, GFR_DEFAULT_ALIGN, name, + IORES_DESC_DEVICE_PRIVATE_MEMORY, flags); } EXPORT_SYMBOL_GPL(request_free_mem_region); -#endif /* CONFIG_DEVICE_PRIVATE */ +/** + * alloc_free_mem_region - find a free region relative to @base + * @base: resource that will parent the new resource + * @size: size in bytes of memory to allocate from @base + * @align: alignment requirements for the allocation + * @name: resource name + * + * Buses like CXL, that can dynamically instantiate new memory regions, + * need a method to allocate physical address space for those regions. + * Allocate and insert a new resource to cover a free, unclaimed by a + * descendant of @base, range in the span of @base. + */ +struct resource *alloc_free_mem_region(struct resource *base, + unsigned long size, unsigned long align, + const char *name) +{ + /* GFR_ASCENDING | GFR_INSERT_RESOURCE */ + unsigned long flags = 0; + + return get_free_mem_region(NULL, base, size, align, name, + IORES_DESC_NONE, flags); +} +EXPORT_SYMBOL_NS_GPL(alloc_free_mem_region, CXL); +#endif /* CONFIG_GET_FREE_REGION */ static int __init strict_iomem(char *str) { diff --git a/mm/Kconfig b/mm/Kconfig index 169e64192e48..a5b4fee2e3fd 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -994,9 +994,14 @@ config HMM_MIRROR bool depends on MMU +config GET_FREE_REGION + depends on SPARSEMEM + bool + config DEVICE_PRIVATE bool "Unaddressable device memory (GPU memory, ...)" depends on ZONE_DEVICE + select GET_FREE_REGION help Allows creation of struct pages to represent unaddressable device From patchwork Fri Jun 24 04:19:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893656 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADDE1CCA47F for ; Fri, 24 Jun 2022 04:20:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230181AbiFXEUQ (ORCPT ); Fri, 24 Jun 2022 00:20:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229892AbiFXEUN (ORCPT ); Fri, 24 Jun 2022 00:20:13 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89C5F41339; Thu, 23 Jun 2022 21:20:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044412; x=1687580412; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qJOYOhlxmLgSe99rfSeP4YKc+5KJzFUtxXK0PauXKFw=; b=jG3l+nAccfyDhFZryJCvmSmCGDewgW5KFV4hv9HDqBoQqSXPdJV2nNF5 aWTVCid5zcLGCzUvvkQmtdBVkY+pCjtEGAMyGOtrNNO7wY8QQsVTRAgzS 1lQcaoNY3XmQCazQdoF3JTOl5Rv44pgWqS7E3poUgCtWo6ERWBKhA6OQK h0QOUzmv8tizbphlMwL9OHf+EfHxyZ2VbSj4Y85IBg8iiKkkniiYI0FYf 2ySJkgk7y+42BRveKmaTfKXXCQL6839mUvwD5YQ1+9QSt4u69bu1raY3u xSBIR1srmCrp385jcxAmbnv3nyE+gQorK77lSOYargWSlRRUp+d8hyTqw w==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367238015" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367238015" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:12 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092929" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:12 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Ben Widawsky , Dan Williams Subject: [PATCH 34/46] cxl/region: Add region creation support Date: Thu, 23 Jun 2022 21:19:38 -0700 Message-Id: <20220624041950.559155-9-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Ben Widawsky CXL 2.0 allows for dynamic provisioning of new memory regions (system physical address resources like "System RAM" and "Persistent Memory"). Whereas DDR and PMEM resources are conveyed statically at boot, CXL allows for assembling and instantiating new regions from the available capacity of CXL memory expanders in the system. Sysfs with an "echo $region_name > $create_region_attribute" interface is chosen as the mechanism to initiate the provisioning process. This was chosen over ioctl() and netlink() to keep the configuration interface entirely in a pseudo-fs interface, and it was chosen over configfs since, aside from this one creation event, the interface is read-mostly. I.e. configfs supports cases where an object is designed to be provisioned each boot, like an iSCSI storage target, and CXL region creation is mostly for PMEM regions which are created usually once per-lifetime of a server instance. Recall that the major change that CXL brings over previous persistent memory architectures is the ability to dynamically define new regions. Compare that to drivers like 'nfit' where the region configuration is statically defined by platform firmware. Regions are created as a child of a root decoder that encompasses an address space with constraints. When created through sysfs, the root decoder is explicit. When created from an LSA's region structure a root decoder will possibly need to be inferred by the driver. Upon region creation through sysfs, a vacant region is created with a unique name. Regions have a number of attributes that must be configured before the region can be bound to the driver where HDM decoder program is completed. An example of creating a new region: - Allocate a new region name: region=$(cat /sys/bus/cxl/devices/decoder0.0/create_pmem_region) - Create a new region by name: while region=$(cat /sys/bus/cxl/devices/decoder0.0/create_pmem_region) ! echo $region > /sys/bus/cxl/devices/decoder0.0/create_pmem_region do true; done - Region now exists in sysfs: stat -t /sys/bus/cxl/devices/decoder0.0/$region - Delete the region, and name: echo $region > /sys/bus/cxl/devices/decoder0.0/delete_region Signed-off-by: Ben Widawsky [djbw: simplify locking, reword changelog] Signed-off-by: Dan Williams --- Documentation/ABI/testing/sysfs-bus-cxl | 25 +++ .../driver-api/cxl/memory-devices.rst | 11 + drivers/cxl/Kconfig | 5 + drivers/cxl/core/Makefile | 1 + drivers/cxl/core/core.h | 12 ++ drivers/cxl/core/port.c | 39 +++- drivers/cxl/core/region.c | 199 ++++++++++++++++++ drivers/cxl/cxl.h | 18 ++ tools/testing/cxl/Kbuild | 1 + 9 files changed, 308 insertions(+), 3 deletions(-) create mode 100644 drivers/cxl/core/region.c diff --git a/Documentation/ABI/testing/sysfs-bus-cxl b/Documentation/ABI/testing/sysfs-bus-cxl index 2a4e4163879f..9a4856066631 100644 --- a/Documentation/ABI/testing/sysfs-bus-cxl +++ b/Documentation/ABI/testing/sysfs-bus-cxl @@ -238,3 +238,28 @@ Description: (RO) The number of consecutive bytes of host physical address space this decoder claims at address N before awaint the next address (N + interleave_granularity * intereleave_ways). + + +What: /sys/bus/cxl/devices/decoderX.Y/create_pmem_region +Date: May, 2022 +KernelVersion: v5.20 +Contact: linux-cxl@vger.kernel.org +Description: + (RW) Write a string in the form 'regionZ' to start the process + of defining a new persistent memory region (interleave-set) + within the decode range bounded by root decoder 'decoderX.Y'. + The value written must match the current value returned from + reading this attribute. An atomic compare exchange operation is + done on write to assign the requested id to a region and + allocate the region-id for the next creation attempt. EBUSY is + returned if the region name written does not match the current + cached value. + + +What: /sys/bus/cxl/devices/decoderX.Y/delete_region +Date: May, 2022 +KernelVersion: v5.20 +Contact: linux-cxl@vger.kernel.org +Description: + (WO) Write a string in the form 'regionZ' to delete that region, + provided it is currently idle / not bound to a driver. diff --git a/Documentation/driver-api/cxl/memory-devices.rst b/Documentation/driver-api/cxl/memory-devices.rst index db476bb170b6..66ddc58a21b1 100644 --- a/Documentation/driver-api/cxl/memory-devices.rst +++ b/Documentation/driver-api/cxl/memory-devices.rst @@ -362,6 +362,17 @@ CXL Core .. kernel-doc:: drivers/cxl/core/mbox.c :doc: cxl mbox +CXL Regions +----------- +.. kernel-doc:: drivers/cxl/region.h + :identifiers: + +.. kernel-doc:: drivers/cxl/core/region.c + :doc: cxl core region + +.. kernel-doc:: drivers/cxl/core/region.c + :identifiers: + External Interfaces =================== diff --git a/drivers/cxl/Kconfig b/drivers/cxl/Kconfig index f64e3984689f..aa2728de419e 100644 --- a/drivers/cxl/Kconfig +++ b/drivers/cxl/Kconfig @@ -102,4 +102,9 @@ config CXL_SUSPEND def_bool y depends on SUSPEND && CXL_MEM +config CXL_REGION + bool + default CXL_BUS + select MEMREGION + endif diff --git a/drivers/cxl/core/Makefile b/drivers/cxl/core/Makefile index 9d35085d25af..79c7257f4107 100644 --- a/drivers/cxl/core/Makefile +++ b/drivers/cxl/core/Makefile @@ -10,3 +10,4 @@ cxl_core-y += memdev.o cxl_core-y += mbox.o cxl_core-y += pci.o cxl_core-y += hdm.o +cxl_core-$(CONFIG_CXL_REGION) += region.o diff --git a/drivers/cxl/core/core.h b/drivers/cxl/core/core.h index 472ec9cb1018..ebe6197fb9b8 100644 --- a/drivers/cxl/core/core.h +++ b/drivers/cxl/core/core.h @@ -9,6 +9,18 @@ extern const struct device_type cxl_nvdimm_type; extern struct attribute_group cxl_base_attribute_group; +#ifdef CONFIG_CXL_REGION +extern struct device_attribute dev_attr_create_pmem_region; +extern struct device_attribute dev_attr_delete_region; +/* + * Note must be used at the end of an attribute list, since it + * terminates the list in the CONFIG_CXL_REGION=n case. + */ +#define CXL_REGION_ATTR(x) (&dev_attr_##x.attr) +#else +#define CXL_REGION_ATTR(x) NULL +#endif + struct cxl_send_command; struct cxl_mem_query_commands; int cxl_query_cmd(struct cxl_memdev *cxlmd, diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 2e56903399c2..c9207ebc3f32 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* Copyright(c) 2020 Intel Corporation. All rights reserved. */ #include +#include #include #include #include @@ -300,11 +301,35 @@ static struct attribute *cxl_decoder_root_attrs[] = { &dev_attr_cap_type2.attr, &dev_attr_cap_type3.attr, &dev_attr_target_list.attr, + CXL_REGION_ATTR(create_pmem_region), + CXL_REGION_ATTR(delete_region), NULL, }; +static bool can_create_pmem(struct cxl_root_decoder *cxlrd) +{ + unsigned long flags = CXL_DECODER_F_TYPE3 | CXL_DECODER_F_PMEM; + + return (cxlrd->cxlsd.cxld.flags & flags) == flags; +} + +static umode_t cxl_root_decoder_visible(struct kobject *kobj, struct attribute *a, int n) +{ + struct device *dev = kobj_to_dev(kobj); + struct cxl_root_decoder *cxlrd = to_cxl_root_decoder(dev); + + if (a == CXL_REGION_ATTR(create_pmem_region) && !can_create_pmem(cxlrd)) + return 0; + + if (a == CXL_REGION_ATTR(delete_region) && !can_create_pmem(cxlrd)) + return 0; + + return a->mode; +} + static struct attribute_group cxl_decoder_root_attribute_group = { .attrs = cxl_decoder_root_attrs, + .is_visible = cxl_root_decoder_visible, }; static const struct attribute_group *cxl_decoder_root_attribute_groups[] = { @@ -387,6 +412,7 @@ static void cxl_root_decoder_release(struct device *dev) { struct cxl_root_decoder *cxlrd = to_cxl_root_decoder(dev); + memregion_free(atomic_read(&cxlrd->region_id)); __cxl_decoder_release(&cxlrd->cxlsd.cxld); kfree(cxlrd); } @@ -1415,6 +1441,7 @@ static struct lock_class_key cxl_decoder_key; static struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, unsigned int nr_targets) { + struct cxl_root_decoder *cxlrd = NULL; struct cxl_decoder *cxld; struct device *dev; void *alloc; @@ -1425,16 +1452,20 @@ static struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, if (nr_targets) { struct cxl_switch_decoder *cxlsd; - struct cxl_root_decoder *cxlrd; if (is_cxl_root(port)) { alloc = kzalloc(struct_size(cxlrd, cxlsd.target, nr_targets), GFP_KERNEL); cxlrd = alloc; - if (cxlrd) + if (cxlrd) { cxlsd = &cxlrd->cxlsd; - else + atomic_set(&cxlrd->region_id, -1); + rc = memregion_alloc(GFP_KERNEL); + if (rc < 0) + goto err; + atomic_set(&cxlrd->region_id, rc); + } else cxlsd = NULL; } else { alloc = kzalloc(struct_size(cxlsd, target, nr_targets), @@ -1490,6 +1521,8 @@ static struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, return cxld; err: + if (cxlrd && atomic_read(&cxlrd->region_id) >= 0) + memregion_free(atomic_read(&cxlrd->region_id)); kfree(alloc); return ERR_PTR(rc); } diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c new file mode 100644 index 000000000000..f2a0ead20ca7 --- /dev/null +++ b/drivers/cxl/core/region.c @@ -0,0 +1,199 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright(c) 2022 Intel Corporation. All rights reserved. */ +#include +#include +#include +#include +#include +#include +#include +#include "core.h" + +/** + * DOC: cxl core region + * + * CXL Regions represent mapped memory capacity in system physical address + * space. Whereas the CXL Root Decoders identify the bounds of potential CXL + * Memory ranges, Regions represent the active mapped capacity by the HDM + * Decoder Capability structures throughout the Host Bridges, Switches, and + * Endpoints in the topology. + */ + +static struct cxl_region *to_cxl_region(struct device *dev); + +static void cxl_region_release(struct device *dev) +{ + struct cxl_region *cxlr = to_cxl_region(dev); + + memregion_free(cxlr->id); + kfree(cxlr); +} + +static const struct device_type cxl_region_type = { + .name = "cxl_region", + .release = cxl_region_release, +}; + +bool is_cxl_region(struct device *dev) +{ + return dev->type == &cxl_region_type; +} +EXPORT_SYMBOL_NS_GPL(is_cxl_region, CXL); + +static struct cxl_region *to_cxl_region(struct device *dev) +{ + if (dev_WARN_ONCE(dev, dev->type != &cxl_region_type, + "not a cxl_region device\n")) + return NULL; + + return container_of(dev, struct cxl_region, dev); +} + +static void unregister_region(void *dev) +{ + device_unregister(dev); +} + +static struct lock_class_key cxl_region_key; + +static struct cxl_region *cxl_region_alloc(struct cxl_root_decoder *cxlrd, int id) +{ + struct cxl_region *cxlr; + struct device *dev; + + cxlr = kzalloc(sizeof(*cxlr), GFP_KERNEL); + if (!cxlr) { + memregion_free(id); + return ERR_PTR(-ENOMEM); + } + + dev = &cxlr->dev; + device_initialize(dev); + lockdep_set_class(&dev->mutex, &cxl_region_key); + dev->parent = &cxlrd->cxlsd.cxld.dev; + device_set_pm_not_required(dev); + dev->bus = &cxl_bus_type; + dev->type = &cxl_region_type; + cxlr->id = id; + + return cxlr; +} + +/** + * devm_cxl_add_region - Adds a region to a decoder + * @cxlrd: root decoder + * @id: memregion id to create + * @mode: mode for the endpoint decoders of this region + * + * This is the second step of region initialization. Regions exist within an + * address space which is mapped by a @cxlrd. + * + * Return: 0 if the region was added to the @cxlrd, else returns negative error + * code. The region will be named "regionZ" where Z is the unique region number. + */ +static struct cxl_region *devm_cxl_add_region(struct cxl_root_decoder *cxlrd, + int id, + enum cxl_decoder_mode mode, + enum cxl_decoder_type type) +{ + struct cxl_port *port = to_cxl_port(cxlrd->cxlsd.cxld.dev.parent); + struct cxl_region *cxlr; + struct device *dev; + int rc; + + cxlr = cxl_region_alloc(cxlrd, id); + if (IS_ERR(cxlr)) + return cxlr; + cxlr->mode = mode; + cxlr->type = type; + + dev = &cxlr->dev; + rc = dev_set_name(dev, "region%d", id); + if (rc) + goto err; + + rc = device_add(dev); + if (rc) + goto err; + + rc = devm_add_action_or_reset(port->uport, unregister_region, cxlr); + if (rc) + return ERR_PTR(rc); + + dev_dbg(port->uport, "%s: created %s\n", + dev_name(&cxlrd->cxlsd.cxld.dev), dev_name(dev)); + return cxlr; + +err: + put_device(dev); + return ERR_PTR(rc); +} + +static ssize_t create_pmem_region_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct cxl_root_decoder *cxlrd = to_cxl_root_decoder(dev); + + return sysfs_emit(buf, "region%u\n", atomic_read(&cxlrd->region_id)); +} + +static ssize_t create_pmem_region_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct cxl_root_decoder *cxlrd = to_cxl_root_decoder(dev); + struct cxl_region *cxlr; + unsigned int id, rc; + + rc = sscanf(buf, "region%u\n", &id); + if (rc != 1) + return -EINVAL; + + rc = memregion_alloc(GFP_KERNEL); + if (rc < 0) + return rc; + + if (atomic_cmpxchg(&cxlrd->region_id, id, rc) != id) { + memregion_free(rc); + return -EBUSY; + } + + cxlr = devm_cxl_add_region(cxlrd, id, CXL_DECODER_PMEM, + CXL_DECODER_EXPANDER); + if (IS_ERR(cxlr)) + return PTR_ERR(cxlr); + + return len; +} +DEVICE_ATTR_RW(create_pmem_region); + +static struct cxl_region *cxl_find_region_by_name(struct cxl_decoder *cxld, + const char *name) +{ + struct device *region_dev; + + region_dev = device_find_child_by_name(&cxld->dev, name); + if (!region_dev) + return ERR_PTR(-ENODEV); + + return to_cxl_region(region_dev); +} + +static ssize_t delete_region_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct cxl_port *port = to_cxl_port(dev->parent); + struct cxl_decoder *cxld = to_cxl_decoder(dev); + struct cxl_region *cxlr; + + cxlr = cxl_find_region_by_name(cxld, buf); + if (IS_ERR(cxlr)) + return PTR_ERR(cxlr); + + devm_release_action(port->uport, unregister_region, cxlr); + put_device(&cxlr->dev); + + return len; +} +DEVICE_ATTR_WO(delete_region); diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index f761cf78cc05..49b73b2e44a9 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -279,13 +279,29 @@ struct cxl_switch_decoder { /** * struct cxl_root_decoder - Static platform CXL address decoder * @res: host / parent resource for region allocations + * @region_id: region id for next region provisioning event * @cxlsd: base cxl switch decoder */ struct cxl_root_decoder { struct resource *res; + atomic_t region_id; struct cxl_switch_decoder cxlsd; }; +/** + * struct cxl_region - CXL region + * @dev: This region's device + * @id: This region's id. Id is globally unique across all regions + * @mode: Endpoint decoder allocation / access mode + * @type: Endpoint decoder target type + */ +struct cxl_region { + struct device dev; + int id; + enum cxl_decoder_mode mode; + enum cxl_decoder_type type; +}; + /** * enum cxl_nvdimm_brige_state - state machine for managing bus rescans * @CXL_NVB_NEW: Set at bridge create and after cxl_pmem_wq is destroyed @@ -434,6 +450,8 @@ struct cxl_hdm *devm_cxl_setup_hdm(struct cxl_port *port); int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm); int devm_cxl_add_passthrough_decoder(struct cxl_port *port); +bool is_cxl_region(struct device *dev); + extern struct bus_type cxl_bus_type; struct cxl_driver { diff --git a/tools/testing/cxl/Kbuild b/tools/testing/cxl/Kbuild index 33543231d453..500be85729cc 100644 --- a/tools/testing/cxl/Kbuild +++ b/tools/testing/cxl/Kbuild @@ -47,6 +47,7 @@ cxl_core-y += $(CXL_CORE_SRC)/memdev.o cxl_core-y += $(CXL_CORE_SRC)/mbox.o cxl_core-y += $(CXL_CORE_SRC)/pci.o cxl_core-y += $(CXL_CORE_SRC)/hdm.o +cxl_core-$(CONFIG_CXL_REGION) += $(CXL_CORE_SRC)/region.o cxl_core-y += config_check.o obj-m += test/ From patchwork Fri Jun 24 04:19:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893655 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 485FDCCA48C for ; Fri, 24 Jun 2022 04:20:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230136AbiFXEUQ (ORCPT ); Fri, 24 Jun 2022 00:20:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229499AbiFXEUN (ORCPT ); Fri, 24 Jun 2022 00:20:13 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E359749CBE; Thu, 23 Jun 2022 21:20:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044412; x=1687580412; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FJ+bHfjcyMc1b9C/HvSsIpbtbXqAWfkW73dd39hPy0w=; b=Fl5BVuct39xEQDUtIf6u3XP4uf4/eBvog66hNcmBQJsgXzqydzC8VIYQ HJmh5lBQWSQKgHbCn7UtezWZ+FoyOJalWm5G45v1Q+qt6RX9jzHD2H/Bs p3Gb5hx1W4cCi0Z0BQYd4mi9+3b1fEr62Ul8mjddMaoNWzHPAam8SaBNF dTz5MXX/Kr11+3hzlA48hdNVVAU5ACTN/NDx5XKj9cWAqNF6EZa6GK8KA OxP6HJgZ6c/qhsqfvFK1GouoXA8E8lqMI6Er43cvov5ISm3hdJfafmkK4 expsdiayXph67f0sgkkMNWFN6Y86mbqQrns+gPSVKzgyLh+omeXa/FGPD g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367238025" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367238025" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:12 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092932" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:12 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Ben Widawsky , Dan Williams Subject: [PATCH 35/46] cxl/region: Add a 'uuid' attribute Date: Thu, 23 Jun 2022 21:19:39 -0700 Message-Id: <20220624041950.559155-10-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Ben Widawsky The process of provisioning a region involves triggering the creation of a new region object, pouring in the configuration, and then binding that configured object to the region driver to start is operation. For persistent memory regions the CXL specification mandates that it identified by a uuid. Add an ABI for userspace to specify a region's uuid. Signed-off-by: Ben Widawsky [djbw: simplify locking] Signed-off-by: Dan Williams --- Documentation/ABI/testing/sysfs-bus-cxl | 10 +++ drivers/cxl/core/region.c | 115 ++++++++++++++++++++++++ drivers/cxl/cxl.h | 25 ++++++ 3 files changed, 150 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-bus-cxl b/Documentation/ABI/testing/sysfs-bus-cxl index 9a4856066631..d30c95a758a9 100644 --- a/Documentation/ABI/testing/sysfs-bus-cxl +++ b/Documentation/ABI/testing/sysfs-bus-cxl @@ -263,3 +263,13 @@ Contact: linux-cxl@vger.kernel.org Description: (WO) Write a string in the form 'regionZ' to delete that region, provided it is currently idle / not bound to a driver. + + +What: /sys/bus/cxl/devices/regionZ/uuid +Date: May, 2022 +KernelVersion: v5.20 +Contact: linux-cxl@vger.kernel.org +Description: + (RW) Write a unique identifier for the region. This field must + be set for persistent regions and it must not conflict with the + UUID of another region. diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index f2a0ead20ca7..f75978f846b9 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include "core.h" @@ -17,10 +18,123 @@ * Memory ranges, Regions represent the active mapped capacity by the HDM * Decoder Capability structures throughout the Host Bridges, Switches, and * Endpoints in the topology. + * + * Region configuration has ordering constraints. UUID may be set at any time + * but is only visible for persistent regions. + */ + +/* + * All changes to the interleave configuration occur with this lock held + * for write. */ +static DECLARE_RWSEM(cxl_region_rwsem); static struct cxl_region *to_cxl_region(struct device *dev); +static ssize_t uuid_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct cxl_region *cxlr = to_cxl_region(dev); + struct cxl_region_params *p = &cxlr->params; + ssize_t rc; + + rc = down_read_interruptible(&cxl_region_rwsem); + if (rc) + return rc; + rc = sysfs_emit(buf, "%pUb\n", &p->uuid); + up_read(&cxl_region_rwsem); + + return rc; +} + +static int is_dup(struct device *match, void *data) +{ + struct cxl_region_params *p; + struct cxl_region *cxlr; + uuid_t *uuid = data; + + if (!is_cxl_region(match)) + return 0; + + lockdep_assert_held(&cxl_region_rwsem); + cxlr = to_cxl_region(match); + p = &cxlr->params; + + if (uuid_equal(&p->uuid, uuid)) { + dev_dbg(match, "already has uuid: %pUb\n", uuid); + return -EBUSY; + } + + return 0; +} + +static ssize_t uuid_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t len) +{ + struct cxl_region *cxlr = to_cxl_region(dev); + struct cxl_region_params *p = &cxlr->params; + uuid_t temp; + ssize_t rc; + + if (len != UUID_STRING_LEN + 1) + return -EINVAL; + + rc = uuid_parse(buf, &temp); + if (rc) + return rc; + + if (uuid_is_null(&temp)) + return -EINVAL; + + rc = down_write_killable(&cxl_region_rwsem); + if (rc) + return rc; + + rc = -EBUSY; + if (p->state >= CXL_CONFIG_ACTIVE) + goto out; + + rc = bus_for_each_dev(&cxl_bus_type, NULL, &temp, is_dup); + if (rc < 0) + goto out; + + uuid_copy(&p->uuid, &temp); +out: + up_write(&cxl_region_rwsem); + + if (rc) + return rc; + return len; +} +static DEVICE_ATTR_RW(uuid); + +static umode_t cxl_region_visible(struct kobject *kobj, struct attribute *a, + int n) +{ + struct device *dev = kobj_to_dev(kobj); + struct cxl_region *cxlr = to_cxl_region(dev); + + if (a == &dev_attr_uuid.attr && cxlr->mode != CXL_DECODER_PMEM) + return 0; + return a->mode; +} + +static struct attribute *cxl_region_attrs[] = { + &dev_attr_uuid.attr, + NULL, +}; + +static const struct attribute_group cxl_region_group = { + .attrs = cxl_region_attrs, + .is_visible = cxl_region_visible, +}; + +static const struct attribute_group *region_groups[] = { + &cxl_base_attribute_group, + &cxl_region_group, + NULL, +}; + static void cxl_region_release(struct device *dev) { struct cxl_region *cxlr = to_cxl_region(dev); @@ -32,6 +146,7 @@ static void cxl_region_release(struct device *dev) static const struct device_type cxl_region_type = { .name = "cxl_region", .release = cxl_region_release, + .groups = region_groups }; bool is_cxl_region(struct device *dev) diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 49b73b2e44a9..46a9f8acc602 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -288,18 +288,43 @@ struct cxl_root_decoder { struct cxl_switch_decoder cxlsd; }; +/* + * enum cxl_config_state - State machine for region configuration + * @CXL_CONFIG_IDLE: Any sysfs attribute can be written freely + * @CXL_CONFIG_ACTIVE: All targets have been added the region is now + * active + */ +enum cxl_config_state { + CXL_CONFIG_IDLE, + CXL_CONFIG_ACTIVE, +}; + +/** + * struct cxl_region_params - region settings + * @state: allow the driver to lockdown further parameter changes + * @uuid: unique id for persistent regions + * + * State transitions are protected by the cxl_region_rwsem + */ +struct cxl_region_params { + enum cxl_config_state state; + uuid_t uuid; +}; + /** * struct cxl_region - CXL region * @dev: This region's device * @id: This region's id. Id is globally unique across all regions * @mode: Endpoint decoder allocation / access mode * @type: Endpoint decoder target type + * @params: active + config params for the region */ struct cxl_region { struct device dev; int id; enum cxl_decoder_mode mode; enum cxl_decoder_type type; + struct cxl_region_params params; }; /** From patchwork Fri Jun 24 04:19:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893657 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC46BCCA483 for ; Fri, 24 Jun 2022 04:20:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230404AbiFXEUR (ORCPT ); Fri, 24 Jun 2022 00:20:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229584AbiFXEUO (ORCPT ); Fri, 24 Jun 2022 00:20:14 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B5BC4FC6A; Thu, 23 Jun 2022 21:20:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044413; x=1687580413; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cynHFOPTZEzPT0SWJhn9Y1PKFyxrjTTRzNjEWfvWhdE=; b=JLaMztxmfxsyHf0XeRDLiDHQ3Rb7MP1T5nG8aN2GxRoTr4aSKtZgVTBg UwVGsiAvdmXQ+85Py5CQuT5Z8yca/3EFoEjyozztSvIif8hitt0OTRodF K2u6q4i7XhuL9H0esp6rJpUBbynjeV12VNFF1sxv4h7XfVtE31aXDnp/M PMt7YvMw1IqY++vhCBYj++UDwylhI2LA3v3aR5uOa2zAlQeWOaQau8g7Q r/eqf1zuv7lQZ815tFwDMylBu/M/yJt1xuTC+CNxjXUTe5KIMRls3iSWk PgxUlKAFebnc6dhFanlQrN8xenBu77EfAMDY6gEnyPvhdp3qafF/buFVz g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367238027" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367238027" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:13 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092935" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:12 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Ben Widawsky , Dan Williams Subject: [PATCH 36/46] cxl/region: Add interleave ways attribute Date: Thu, 23 Jun 2022 21:19:40 -0700 Message-Id: <20220624041950.559155-11-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Ben Widawsky Add an ABI to allow the number of devices that comprise a region to be set. Signed-off-by: Ben Widawsky [djbw: reword changelog] Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- Documentation/ABI/testing/sysfs-bus-cxl | 21 ++++ drivers/cxl/core/region.c | 128 ++++++++++++++++++++++++ drivers/cxl/cxl.h | 33 ++++++ 3 files changed, 182 insertions(+) diff --git a/Documentation/ABI/testing/sysfs-bus-cxl b/Documentation/ABI/testing/sysfs-bus-cxl index d30c95a758a9..46d5295c1149 100644 --- a/Documentation/ABI/testing/sysfs-bus-cxl +++ b/Documentation/ABI/testing/sysfs-bus-cxl @@ -273,3 +273,24 @@ Description: (RW) Write a unique identifier for the region. This field must be set for persistent regions and it must not conflict with the UUID of another region. + + +What: /sys/bus/cxl/devices/regionZ/interleave_granularity +Date: May, 2022 +KernelVersion: v5.20 +Contact: linux-cxl@vger.kernel.org +Description: + (RW) Set the number of consecutive bytes each device in the + interleave set will claim. The possible interleave granularity + values are determined by the CXL spec and the participating + devices. + + +What: /sys/bus/cxl/devices/regionZ/interleave_ways +Date: May, 2022 +KernelVersion: v5.20 +Contact: linux-cxl@vger.kernel.org +Description: + (RW) Configures the number of devices participating in the + region is set by writing this value. Each device will provide + 1/interleave_ways of storage for the region. diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index f75978f846b9..78af42454760 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include "core.h" @@ -21,6 +22,8 @@ * * Region configuration has ordering constraints. UUID may be set at any time * but is only visible for persistent regions. + * 1. Interleave granularity + * 2. Interleave size */ /* @@ -119,8 +122,129 @@ static umode_t cxl_region_visible(struct kobject *kobj, struct attribute *a, return a->mode; } +static ssize_t interleave_ways_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct cxl_region *cxlr = to_cxl_region(dev); + struct cxl_region_params *p = &cxlr->params; + ssize_t rc; + + rc = down_read_interruptible(&cxl_region_rwsem); + if (rc) + return rc; + rc = sysfs_emit(buf, "%d\n", p->interleave_ways); + up_read(&cxl_region_rwsem); + + return rc; +} + +static ssize_t interleave_ways_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct cxl_root_decoder *cxlrd = to_cxl_root_decoder(dev->parent); + struct cxl_decoder *cxld = &cxlrd->cxlsd.cxld; + struct cxl_region *cxlr = to_cxl_region(dev); + struct cxl_region_params *p = &cxlr->params; + int rc, val; + u8 iw; + + rc = kstrtoint(buf, 0, &val); + if (rc) + return rc; + + rc = ways_to_cxl(val, &iw); + if (rc) + return rc; + + /* + * Even for x3, x9, and x12 interleaves the region interleave must be a + * power of 2 multiple of the host bridge interleave. + */ + if (!is_power_of_2(val / cxld->interleave_ways) || + (val % cxld->interleave_ways)) { + dev_dbg(&cxlr->dev, "invalid interleave: %d\n", val); + return -EINVAL; + } + + rc = down_write_killable(&cxl_region_rwsem); + if (rc) + return rc; + if (p->state >= CXL_CONFIG_INTERLEAVE_ACTIVE) { + rc = -EBUSY; + goto out; + } + + p->interleave_ways = val; +out: + up_read(&cxl_region_rwsem); + if (rc) + return rc; + return len; +} +static DEVICE_ATTR_RW(interleave_ways); + +static ssize_t interleave_granularity_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct cxl_region *cxlr = to_cxl_region(dev); + struct cxl_region_params *p = &cxlr->params; + ssize_t rc; + + rc = down_read_interruptible(&cxl_region_rwsem); + if (rc) + return rc; + rc = sysfs_emit(buf, "%d\n", p->interleave_granularity); + up_read(&cxl_region_rwsem); + + return rc; +} + +static ssize_t interleave_granularity_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + struct cxl_root_decoder *cxlrd = to_cxl_root_decoder(dev->parent); + struct cxl_decoder *cxld = &cxlrd->cxlsd.cxld; + struct cxl_region *cxlr = to_cxl_region(dev); + struct cxl_region_params *p = &cxlr->params; + int rc, val; + u16 ig; + + rc = kstrtoint(buf, 0, &val); + if (rc) + return rc; + + rc = granularity_to_cxl(val, &ig); + if (rc) + return rc; + + /* region granularity must be >= root granularity */ + if (val < cxld->interleave_granularity) + return -EINVAL; + + rc = down_write_killable(&cxl_region_rwsem); + if (rc) + return rc; + if (p->state >= CXL_CONFIG_INTERLEAVE_ACTIVE) { + rc = -EBUSY; + goto out; + } + + p->interleave_granularity = val; +out: + up_read(&cxl_region_rwsem); + if (rc) + return rc; + return len; +} +static DEVICE_ATTR_RW(interleave_granularity); + static struct attribute *cxl_region_attrs[] = { &dev_attr_uuid.attr, + &dev_attr_interleave_ways.attr, + &dev_attr_interleave_granularity.attr, NULL, }; @@ -212,6 +336,8 @@ static struct cxl_region *devm_cxl_add_region(struct cxl_root_decoder *cxlrd, enum cxl_decoder_type type) { struct cxl_port *port = to_cxl_port(cxlrd->cxlsd.cxld.dev.parent); + struct cxl_decoder *cxld = &cxlrd->cxlsd.cxld; + struct cxl_region_params *p; struct cxl_region *cxlr; struct device *dev; int rc; @@ -219,8 +345,10 @@ static struct cxl_region *devm_cxl_add_region(struct cxl_root_decoder *cxlrd, cxlr = cxl_region_alloc(cxlrd, id); if (IS_ERR(cxlr)) return cxlr; + p = &cxlr->params; cxlr->mode = mode; cxlr->type = type; + p->interleave_granularity = cxld->interleave_granularity; dev = &cxlr->dev; rc = dev_set_name(dev, "region%d", id); diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 46a9f8acc602..13ee04b00e0c 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -7,6 +7,7 @@ #include #include #include +#include #include /** @@ -92,6 +93,31 @@ static inline int cxl_to_ways(u8 eniw, unsigned int *val) return 0; } +static inline int granularity_to_cxl(int g, u16 *ig) +{ + if (g > SZ_16K || g < 256 || !is_power_of_2(g)) + return -EINVAL; + *ig = ilog2(g) - 8; + return 0; +} + +static inline int ways_to_cxl(int ways, u8 *iw) +{ + if (ways > 16) + return -EINVAL; + if (is_power_of_2(ways)) { + *iw = ilog2(ways); + return 0; + } + if (ways % 3) + return -EINVAL; + ways /= 3; + if (!is_power_of_2(ways)) + return -EINVAL; + *iw = ilog2(ways) + 8; + return 0; +} + /* CXL 2.0 8.2.8.1 Device Capabilities Array Register */ #define CXLDEV_CAP_ARRAY_OFFSET 0x0 #define CXLDEV_CAP_ARRAY_CAP_ID 0 @@ -291,11 +317,14 @@ struct cxl_root_decoder { /* * enum cxl_config_state - State machine for region configuration * @CXL_CONFIG_IDLE: Any sysfs attribute can be written freely + * @CXL_CONFIG_INTERLEAVE_ACTIVE: region size has been set, no more + * changes to interleave_ways or interleave_granularity * @CXL_CONFIG_ACTIVE: All targets have been added the region is now * active */ enum cxl_config_state { CXL_CONFIG_IDLE, + CXL_CONFIG_INTERLEAVE_ACTIVE, CXL_CONFIG_ACTIVE, }; @@ -303,12 +332,16 @@ enum cxl_config_state { * struct cxl_region_params - region settings * @state: allow the driver to lockdown further parameter changes * @uuid: unique id for persistent regions + * @interleave_ways: number of endpoints in the region + * @interleave_granularity: capacity each endpoint contributes to a stripe * * State transitions are protected by the cxl_region_rwsem */ struct cxl_region_params { enum cxl_config_state state; uuid_t uuid; + int interleave_ways; + int interleave_granularity; }; /** From patchwork Fri Jun 24 04:19:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893659 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22D7BCCA491 for ; Fri, 24 Jun 2022 04:20:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230476AbiFXEUR (ORCPT ); Fri, 24 Jun 2022 00:20:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229914AbiFXEUO (ORCPT ); Fri, 24 Jun 2022 00:20:14 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AFF0351331; Thu, 23 Jun 2022 21:20:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044413; x=1687580413; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fSlF2VXXQ0/DmGPCkefoOCnkko80YB8DFPEJHcVFEOI=; b=a5mGJM3RRuWzEb0s+nbCmpKRueerrrv4xgbcsi9NGxx9eIa3wWULJlH4 rYRlKmBwcYG+iijIzOw3lfNI/7SYb8euzFDWbhzfk7F6HL7HiiTcP5Kh9 LOLoAWmsahXKryIoECL+/QcyRk/PxLJGiD43b4FFm6NU1VOE7hW5l/wUQ Ehl2AyZFL7Dv+4a1dWYb+WDBMYGgwdsrEY4sl/5HamiYcM2MkV33pnKlK EM28fh667URS7nPFaABdtXyJ/LiV2kEZ/nMzs6E+ug0TOX/Fh1Gn39+P+ KB1YIppRzgmlK2D527T2LuEFCdrAI0tjVhKIolhEgzE0RrQ2QYqL0nRwz Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367238035" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367238035" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:13 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092941" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:13 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Dan Williams , Ben Widawsky Subject: [PATCH 37/46] cxl/region: Allocate host physical address (HPA) capacity to new regions Date: Thu, 23 Jun 2022 21:19:41 -0700 Message-Id: <20220624041950.559155-12-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org After a region's interleave parameters (ways and granularity) are set, add a way for regions to allocate HPA from the free capacity in their decoder. The allocator for this capacity reuses the 'struct resource' based allocator used for CONFIG_DEVICE_PRIVATE. Once the tuple of "ways, granularity, and size" is set the region configuration transitions to the CXL_CONFIG_INTERLEAVE_ACTIVE state which is a precursor to allowing endpoint decoders to be added to a region. Co-developed-by: Ben Widawsky Signed-off-by: Ben Widawsky Signed-off-by: Dan Williams --- Documentation/ABI/testing/sysfs-bus-cxl | 25 ++++ drivers/cxl/Kconfig | 3 + drivers/cxl/core/region.c | 148 +++++++++++++++++++++++- drivers/cxl/cxl.h | 2 + 4 files changed, 177 insertions(+), 1 deletion(-) diff --git a/Documentation/ABI/testing/sysfs-bus-cxl b/Documentation/ABI/testing/sysfs-bus-cxl index 46d5295c1149..3658facc9944 100644 --- a/Documentation/ABI/testing/sysfs-bus-cxl +++ b/Documentation/ABI/testing/sysfs-bus-cxl @@ -294,3 +294,28 @@ Description: (RW) Configures the number of devices participating in the region is set by writing this value. Each device will provide 1/interleave_ways of storage for the region. + + +What: /sys/bus/cxl/devices/regionZ/size +Date: May, 2022 +KernelVersion: v5.20 +Contact: linux-cxl@vger.kernel.org +Description: + (RW) System physical address space to be consumed by the region. + When written to, this attribute will allocate space out of the + CXL root decoder's address space. When read the size of the + address space is reported and should match the span of the + region's resource attribute. Size shall be set after the + interleave configuration parameters. + + +What: /sys/bus/cxl/devices/regionZ/resource +Date: May, 2022 +KernelVersion: v5.20 +Contact: linux-cxl@vger.kernel.org +Description: + (RO) A region is a contiguous partition of a CXL root decoder + address space. Region capacity is allocated by writing to the + size attribute, the resulting physical address space determined + by the driver is reflected here. It is therefore not useful to + read this before writing a value to the size attribute. diff --git a/drivers/cxl/Kconfig b/drivers/cxl/Kconfig index aa2728de419e..74c2cd069d9d 100644 --- a/drivers/cxl/Kconfig +++ b/drivers/cxl/Kconfig @@ -105,6 +105,9 @@ config CXL_SUSPEND config CXL_REGION bool default CXL_BUS + # For MAX_PHYSMEM_BITS + depends on SPARSEMEM select MEMREGION + select GET_FREE_REGION endif diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index 78af42454760..a604c24ff918 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -241,10 +241,150 @@ static ssize_t interleave_granularity_store(struct device *dev, } static DEVICE_ATTR_RW(interleave_granularity); +static ssize_t resource_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct cxl_region *cxlr = to_cxl_region(dev); + struct cxl_region_params *p = &cxlr->params; + u64 resource = -1ULL; + ssize_t rc; + + rc = down_read_interruptible(&cxl_region_rwsem); + if (rc) + return rc; + if (p->res) + resource = p->res->start; + rc = sysfs_emit(buf, "%#llx\n", resource); + up_read(&cxl_region_rwsem); + + return rc; +} +static DEVICE_ATTR_RO(resource); + +static int alloc_hpa(struct cxl_region *cxlr, resource_size_t size) +{ + struct cxl_root_decoder *cxlrd = to_cxl_root_decoder(cxlr->dev.parent); + struct cxl_region_params *p = &cxlr->params; + struct resource *res; + u32 remainder = 0; + + lockdep_assert_held_write(&cxl_region_rwsem); + + /* Nothing to do... */ + if (p->res && resource_size(res) == size) + return 0; + + /* To change size the old size must be freed first */ + if (p->res) + return -EBUSY; + + if (p->state >= CXL_CONFIG_INTERLEAVE_ACTIVE) + return -EBUSY; + + if (!p->interleave_ways || !p->interleave_granularity) + return -ENXIO; + + div_u64_rem(size, SZ_256M * p->interleave_ways, &remainder); + if (remainder) + return -EINVAL; + + res = alloc_free_mem_region(cxlrd->res, size, SZ_256M, + dev_name(&cxlr->dev)); + if (IS_ERR(res)) { + dev_dbg(&cxlr->dev, "failed to allocate HPA: %ld\n", + PTR_ERR(res)); + return PTR_ERR(res); + } + + p->res = res; + p->state = CXL_CONFIG_INTERLEAVE_ACTIVE; + + return 0; +} + +static void cxl_region_iomem_release(struct cxl_region *cxlr) +{ + struct cxl_region_params *p = &cxlr->params; + + if (device_is_registered(&cxlr->dev)) + lockdep_assert_held_write(&cxl_region_rwsem); + if (p->res) { + remove_resource(p->res); + kfree(p->res); + p->res = NULL; + } +} + +static int free_hpa(struct cxl_region *cxlr) +{ + struct cxl_region_params *p = &cxlr->params; + + lockdep_assert_held_write(&cxl_region_rwsem); + + if (!p->res) + return 0; + + if (p->state >= CXL_CONFIG_ACTIVE) + return -EBUSY; + + cxl_region_iomem_release(cxlr); + p->state = CXL_CONFIG_IDLE; + return 0; +} + +static ssize_t size_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t len) +{ + struct cxl_region *cxlr = to_cxl_region(dev); + u64 val; + int rc; + + rc = kstrtou64(buf, 0, &val); + if (rc) + return rc; + + rc = down_write_killable(&cxl_region_rwsem); + if (rc) + return rc; + + if (val) + rc = alloc_hpa(cxlr, val); + else + rc = free_hpa(cxlr); + up_write(&cxl_region_rwsem); + + if (rc) + return rc; + + return len; +} + +static ssize_t size_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct cxl_region *cxlr = to_cxl_region(dev); + struct cxl_region_params *p = &cxlr->params; + u64 size = 0; + ssize_t rc; + + rc = down_read_interruptible(&cxl_region_rwsem); + if (rc) + return rc; + if (p->res) + size = resource_size(p->res); + rc = sysfs_emit(buf, "%#llx\n", size); + up_read(&cxl_region_rwsem); + + return rc; +} +static DEVICE_ATTR_RW(size); + static struct attribute *cxl_region_attrs[] = { &dev_attr_uuid.attr, &dev_attr_interleave_ways.attr, &dev_attr_interleave_granularity.attr, + &dev_attr_resource.attr, + &dev_attr_size.attr, NULL, }; @@ -290,7 +430,11 @@ static struct cxl_region *to_cxl_region(struct device *dev) static void unregister_region(void *dev) { - device_unregister(dev); + struct cxl_region *cxlr = to_cxl_region(dev); + + device_del(dev); + cxl_region_iomem_release(cxlr); + put_device(dev); } static struct lock_class_key cxl_region_key; @@ -440,3 +584,5 @@ static ssize_t delete_region_store(struct device *dev, return len; } DEVICE_ATTR_WO(delete_region); + +MODULE_IMPORT_NS(CXL); diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 13ee04b00e0c..25960c1e4ebd 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -334,6 +334,7 @@ enum cxl_config_state { * @uuid: unique id for persistent regions * @interleave_ways: number of endpoints in the region * @interleave_granularity: capacity each endpoint contributes to a stripe + * @res: allocated iomem capacity for this region * * State transitions are protected by the cxl_region_rwsem */ @@ -342,6 +343,7 @@ struct cxl_region_params { uuid_t uuid; int interleave_ways; int interleave_granularity; + struct resource *res; }; /** From patchwork Fri Jun 24 04:19:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893662 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 599A2CCA485 for ; Fri, 24 Jun 2022 04:20:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231254AbiFXEUS (ORCPT ); Fri, 24 Jun 2022 00:20:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229996AbiFXEUP (ORCPT ); Fri, 24 Jun 2022 00:20:15 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0732751334; Thu, 23 Jun 2022 21:20:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044414; x=1687580414; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=y/zvljFO00DZhTzPCD8OUclPSjOB424LryK3d4rBZ6o=; b=WPvzRn/jmTJLdxrxvY6oyYonbxGhm3RXW4E1+ke+VWtPySZk9iTrp0Nw OuyCzvv0GPjkIpa/xpc3b37A4T8mvYSPpPcdg0K26SlDyRQW8bb1LCZnG wVhvI8wiBe+uqiv95iuE1ti8Sa+Vck6c6RCuIKzhI56Fj3WkEYbqjqcSG W/2kWrEIP/TwF1RePtcFB9GvNBEPL9NYxlgeufCMCk7AHX//891+azFMa wg/w8uHks/KU5rcYlutMcmmOHpnc+Bp1OI2jU7kqZtgsYB0QALuuocpFe 9+2EWoytBS21P/gK9A4tvLccaezHJsyIBj09eeRAkqsV0SWr6YCGvhf6W w==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367238038" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367238038" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:13 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092944" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:13 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Dan Williams , Ben Widawsky Subject: [PATCH 38/46] cxl/region: Enable the assignment of endpoint decoders to regions Date: Thu, 23 Jun 2022 21:19:42 -0700 Message-Id: <20220624041950.559155-13-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The region provisioning process involves allocating DPA to a set of endpoint decoders, and HPA plus the region geometry to a region device. Then the decoder is assigned to the region. At this point several validation steps can be performed to validate that the decoder is suitable to participate in the region. Co-developed-by: Ben Widawsky Signed-off-by: Ben Widawsky Signed-off-by: Dan Williams --- Documentation/ABI/testing/sysfs-bus-cxl | 19 ++ drivers/cxl/core/core.h | 6 + drivers/cxl/core/hdm.c | 13 +- drivers/cxl/core/port.c | 12 +- drivers/cxl/core/region.c | 286 +++++++++++++++++++++++- drivers/cxl/cxl.h | 11 + 6 files changed, 342 insertions(+), 5 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-bus-cxl b/Documentation/ABI/testing/sysfs-bus-cxl index 3658facc9944..f1b74a71927d 100644 --- a/Documentation/ABI/testing/sysfs-bus-cxl +++ b/Documentation/ABI/testing/sysfs-bus-cxl @@ -319,3 +319,22 @@ Description: size attribute, the resulting physical address space determined by the driver is reflected here. It is therefore not useful to read this before writing a value to the size attribute. + + +What: /sys/bus/cxl/devices/regionZ/target[0..N] +Date: May, 2022 +KernelVersion: v5.20 +Contact: linux-cxl@vger.kernel.org +Description: + (RW) Write an endpoint decoder object name to 'targetX' where X + is the intended position of the endpoint device in the region + interleave and N is the 'interleave_ways' setting for the + region. ENXIO is returned if the write results in an impossible + to map decode scenario, like the endpoint is unreachable at that + position relative to the root decoder interleave. EBUSY is + returned if the position in the region is already occupied, or + if the region is not in a state to accept interleave + configuration changes. EINVAL is returned if the object name is + not an endpoint decoder. Once all positions have been + successfully written a final validation for decode conflicts is + performed before activating the region. diff --git a/drivers/cxl/core/core.h b/drivers/cxl/core/core.h index ebe6197fb9b8..36b6bd8dac2b 100644 --- a/drivers/cxl/core/core.h +++ b/drivers/cxl/core/core.h @@ -12,12 +12,17 @@ extern struct attribute_group cxl_base_attribute_group; #ifdef CONFIG_CXL_REGION extern struct device_attribute dev_attr_create_pmem_region; extern struct device_attribute dev_attr_delete_region; +extern struct device_attribute dev_attr_region; +void cxl_decoder_kill_region(struct cxl_endpoint_decoder *cxled); /* * Note must be used at the end of an attribute list, since it * terminates the list in the CONFIG_CXL_REGION=n case. */ #define CXL_REGION_ATTR(x) (&dev_attr_##x.attr) #else +static inline void cxl_decoder_kill_region(struct cxl_endpoint_decoder *cxled) +{ +} #define CXL_REGION_ATTR(x) NULL #endif @@ -35,6 +40,7 @@ int cxl_dpa_alloc(struct cxl_endpoint_decoder *cxled, unsigned long long size); int cxl_dpa_free(struct cxl_endpoint_decoder *cxled); resource_size_t cxl_dpa_size(struct cxl_endpoint_decoder *cxled); resource_size_t cxl_dpa_resource(struct cxl_endpoint_decoder *cxled); +extern struct rw_semaphore cxl_dpa_rwsem; int cxl_memdev_init(void); void cxl_memdev_exit(void); diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index 7b58f6911523..2ee62dde8b23 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -8,7 +8,7 @@ #include "cxlmem.h" #include "core.h" -static DECLARE_RWSEM(cxl_dpa_rwsem); +DECLARE_RWSEM(cxl_dpa_rwsem); /** * DOC: cxl core hdm @@ -308,6 +308,11 @@ int cxl_dpa_free(struct cxl_endpoint_decoder *cxled) rc = 0; goto out; } + if (cxled->cxld.region) { + dev_dbg(dev, "decoder assigned to: %s\n", + dev_name(&cxled->cxld.region->dev)); + goto out; + } if (cxled->cxld.flags & CXL_DECODER_F_ENABLE) { dev_dbg(dev, "decoder enabled\n"); goto out; @@ -378,6 +383,12 @@ int cxl_dpa_alloc(struct cxl_endpoint_decoder *cxled, unsigned long long size) int rc = -EBUSY; down_write(&cxl_dpa_rwsem); + if (cxled->cxld.region) { + dev_dbg(dev, "decoder attached to %s\n", + dev_name(&cxled->cxld.region->dev)); + goto out; + } + if (cxled->cxld.flags & CXL_DECODER_F_ENABLE) { dev_dbg(dev, "decoder enabled\n"); goto out; diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index c9207ebc3f32..562a6453249b 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -288,6 +288,7 @@ static struct attribute *cxl_decoder_base_attrs[] = { &dev_attr_locked.attr, &dev_attr_interleave_granularity.attr, &dev_attr_interleave_ways.attr, + CXL_REGION_ATTR(region), NULL, }; @@ -1483,8 +1484,10 @@ static struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, alloc = kzalloc(sizeof(*cxled), GFP_KERNEL); cxled = alloc; - if (cxled) + if (cxled) { cxld = &cxled->cxld; + cxled->pos = -1; + } } if (!alloc) return ERR_PTR(-ENOMEM); @@ -1690,6 +1693,13 @@ EXPORT_SYMBOL_NS_GPL(cxl_decoder_add, CXL); static void cxld_unregister(void *dev) { + struct cxl_endpoint_decoder *cxled; + + if (is_endpoint_decoder(dev)) { + cxled = to_cxl_endpoint_decoder(dev); + cxl_decoder_kill_region(cxled); + } + device_unregister(dev); } diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index a604c24ff918..4830365f3857 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -24,6 +24,7 @@ * but is only visible for persistent regions. * 1. Interleave granularity * 2. Interleave size + * 3. Decoder targets */ /* @@ -138,6 +139,8 @@ static ssize_t interleave_ways_show(struct device *dev, return rc; } +static const struct attribute_group *get_cxl_region_target_group(void); + static ssize_t interleave_ways_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t len) @@ -146,7 +149,7 @@ static ssize_t interleave_ways_store(struct device *dev, struct cxl_decoder *cxld = &cxlrd->cxlsd.cxld; struct cxl_region *cxlr = to_cxl_region(dev); struct cxl_region_params *p = &cxlr->params; - int rc, val; + int rc, val, save; u8 iw; rc = kstrtoint(buf, 0, &val); @@ -175,9 +178,13 @@ static ssize_t interleave_ways_store(struct device *dev, goto out; } + save = p->interleave_ways; p->interleave_ways = val; + rc = sysfs_update_group(&cxlr->dev.kobj, get_cxl_region_target_group()); + if (rc) + p->interleave_ways = save; out: - up_read(&cxl_region_rwsem); + up_write(&cxl_region_rwsem); if (rc) return rc; return len; @@ -234,7 +241,7 @@ static ssize_t interleave_granularity_store(struct device *dev, p->interleave_granularity = val; out: - up_read(&cxl_region_rwsem); + up_write(&cxl_region_rwsem); if (rc) return rc; return len; @@ -393,9 +400,262 @@ static const struct attribute_group cxl_region_group = { .is_visible = cxl_region_visible, }; +static size_t show_targetN(struct cxl_region *cxlr, char *buf, int pos) +{ + struct cxl_region_params *p = &cxlr->params; + struct cxl_endpoint_decoder *cxled; + int rc; + + rc = down_read_interruptible(&cxl_region_rwsem); + if (rc) + return rc; + + if (pos >= p->interleave_ways) { + dev_dbg(&cxlr->dev, "position %d out of range %d\n", pos, + p->interleave_ways); + rc = -ENXIO; + goto out; + } + + cxled = p->targets[pos]; + if (!cxled) + rc = sysfs_emit(buf, "\n"); + else + rc = sysfs_emit(buf, "%s\n", dev_name(&cxled->cxld.dev)); +out: + up_read(&cxl_region_rwsem); + + return rc; +} + +/* + * - Check that the given endpoint is attached to a host-bridge identified + * in the root interleave. + */ +static int cxl_region_attach(struct cxl_region *cxlr, + struct cxl_endpoint_decoder *cxled, int pos) +{ + struct cxl_region_params *p = &cxlr->params; + + if (cxled->mode == CXL_DECODER_DEAD) { + dev_dbg(&cxlr->dev, "%s dead\n", dev_name(&cxled->cxld.dev)); + return -ENODEV; + } + + if (pos >= p->interleave_ways) { + dev_dbg(&cxlr->dev, "position %d out of range %d\n", pos, + p->interleave_ways); + return -ENXIO; + } + + if (p->targets[pos] == cxled) + return 0; + + if (p->targets[pos]) { + struct cxl_endpoint_decoder *cxled_target = p->targets[pos]; + struct cxl_memdev *cxlmd_target = cxled_to_memdev(cxled_target); + + dev_dbg(&cxlr->dev, "position %d already assigned to %s:%s\n", + pos, dev_name(&cxlmd_target->dev), + dev_name(&cxled_target->cxld.dev)); + return -EBUSY; + } + + p->targets[pos] = cxled; + cxled->pos = pos; + p->nr_targets++; + + return 0; +} + +static void cxl_region_detach(struct cxl_endpoint_decoder *cxled) +{ + struct cxl_region *cxlr = cxled->cxld.region; + struct cxl_region_params *p; + + lockdep_assert_held_write(&cxl_region_rwsem); + + if (!cxlr) + return; + + p = &cxlr->params; + get_device(&cxlr->dev); + + if (cxled->pos < 0 || cxled->pos >= p->interleave_ways || + p->targets[cxled->pos] != cxled) { + struct cxl_memdev *cxlmd = cxled_to_memdev(cxled); + + dev_WARN_ONCE(&cxlr->dev, 1, "expected %s:%s at position %d\n", + dev_name(&cxlmd->dev), dev_name(&cxled->cxld.dev), + cxled->pos); + goto out; + } + + p->targets[cxled->pos] = NULL; + p->nr_targets--; + + /* notify the region driver that one of its targets has deparated */ + up_write(&cxl_region_rwsem); + device_release_driver(&cxlr->dev); + down_write(&cxl_region_rwsem); +out: + put_device(&cxlr->dev); +} + +void cxl_decoder_kill_region(struct cxl_endpoint_decoder *cxled) +{ + down_write(&cxl_region_rwsem); + cxled->mode = CXL_DECODER_DEAD; + cxl_region_detach(cxled); + up_write(&cxl_region_rwsem); +} + +static int attach_target(struct cxl_region *cxlr, const char *decoder, int pos) +{ + struct device *dev; + int rc; + + dev = bus_find_device_by_name(&cxl_bus_type, NULL, decoder); + if (!dev) + return -ENODEV; + + if (!is_endpoint_decoder(dev)) { + put_device(dev); + return -EINVAL; + } + + rc = down_write_killable(&cxl_region_rwsem); + if (rc) + goto out; + down_read(&cxl_dpa_rwsem); + rc = cxl_region_attach(cxlr, to_cxl_endpoint_decoder(dev), pos); + up_read(&cxl_dpa_rwsem); + up_write(&cxl_region_rwsem); +out: + put_device(dev); + return rc; +} + +static int detach_target(struct cxl_region *cxlr, int pos) +{ + struct cxl_region_params *p = &cxlr->params; + int rc; + + rc = down_write_killable(&cxl_region_rwsem); + if (rc) + return rc; + + if (pos >= p->interleave_ways) { + dev_dbg(&cxlr->dev, "position %d out of range %d\n", pos, + p->interleave_ways); + rc = -ENXIO; + goto out; + } + + if (!p->targets[pos]) { + rc = 0; + goto out; + } + + cxl_region_detach(p->targets[pos]); + rc = 0; +out: + up_write(&cxl_region_rwsem); + return rc; +} + +static size_t store_targetN(struct cxl_region *cxlr, const char *buf, int pos, + size_t len) +{ + int rc; + + if (sysfs_streq(buf, "\n")) + rc = detach_target(cxlr, pos); + else + rc = attach_target(cxlr, buf, pos); + + if (rc < 0) + return rc; + return len; +} + +#define TARGET_ATTR_RW(n) \ +static ssize_t target##n##_show( \ + struct device *dev, struct device_attribute *attr, char *buf) \ +{ \ + return show_targetN(to_cxl_region(dev), buf, (n)); \ +} \ +static ssize_t target##n##_store(struct device *dev, \ + struct device_attribute *attr, \ + const char *buf, size_t len) \ +{ \ + return store_targetN(to_cxl_region(dev), buf, (n), len); \ +} \ +static DEVICE_ATTR_RW(target##n) + +TARGET_ATTR_RW(0); +TARGET_ATTR_RW(1); +TARGET_ATTR_RW(2); +TARGET_ATTR_RW(3); +TARGET_ATTR_RW(4); +TARGET_ATTR_RW(5); +TARGET_ATTR_RW(6); +TARGET_ATTR_RW(7); +TARGET_ATTR_RW(8); +TARGET_ATTR_RW(9); +TARGET_ATTR_RW(10); +TARGET_ATTR_RW(11); +TARGET_ATTR_RW(12); +TARGET_ATTR_RW(13); +TARGET_ATTR_RW(14); +TARGET_ATTR_RW(15); + +static struct attribute *target_attrs[] = { + &dev_attr_target0.attr, + &dev_attr_target1.attr, + &dev_attr_target2.attr, + &dev_attr_target3.attr, + &dev_attr_target4.attr, + &dev_attr_target5.attr, + &dev_attr_target6.attr, + &dev_attr_target7.attr, + &dev_attr_target8.attr, + &dev_attr_target9.attr, + &dev_attr_target10.attr, + &dev_attr_target11.attr, + &dev_attr_target12.attr, + &dev_attr_target13.attr, + &dev_attr_target14.attr, + &dev_attr_target15.attr, + NULL, +}; + +static umode_t cxl_region_target_visible(struct kobject *kobj, + struct attribute *a, int n) +{ + struct device *dev = kobj_to_dev(kobj); + struct cxl_region *cxlr = to_cxl_region(dev); + struct cxl_region_params *p = &cxlr->params; + + if (n < p->interleave_ways) + return a->mode; + return 0; +} + +static const struct attribute_group cxl_region_target_group = { + .attrs = target_attrs, + .is_visible = cxl_region_target_visible, +}; + +static const struct attribute_group *get_cxl_region_target_group(void) +{ + return &cxl_region_target_group; +} + static const struct attribute_group *region_groups[] = { &cxl_base_attribute_group, &cxl_region_group, + &cxl_region_target_group, NULL, }; @@ -554,6 +814,26 @@ static ssize_t create_pmem_region_store(struct device *dev, } DEVICE_ATTR_RW(create_pmem_region); +static ssize_t region_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct cxl_decoder *cxld = to_cxl_decoder(dev); + ssize_t rc; + + rc = down_read_interruptible(&cxl_region_rwsem); + if (rc) + return rc; + + if (cxld->region) + rc = sysfs_emit(buf, "%s\n", dev_name(&cxld->region->dev)); + else + rc = sysfs_emit(buf, "\n"); + up_read(&cxl_region_rwsem); + + return rc; +} +DEVICE_ATTR_RO(region); + static struct cxl_region *cxl_find_region_by_name(struct cxl_decoder *cxld, const char *name) { diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 25960c1e4ebd..9340deccad4f 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -255,6 +255,7 @@ enum cxl_decoder_type { * @interleave_ways: number of cxl_dports in this decode * @interleave_granularity: data stride per dport * @target_type: accelerator vs expander (type2 vs type3) selector + * @region: currently assigned region for this decoder * @flags: memory type capabilities and locking */ struct cxl_decoder { @@ -264,14 +265,20 @@ struct cxl_decoder { int interleave_ways; int interleave_granularity; enum cxl_decoder_type target_type; + struct cxl_region *region; unsigned long flags; }; +/* + * CXL_DECODER_DEAD prevents endpoints from being reattached to regions + * while cxld_unregister() is running + */ enum cxl_decoder_mode { CXL_DECODER_NONE, CXL_DECODER_RAM, CXL_DECODER_PMEM, CXL_DECODER_MIXED, + CXL_DECODER_DEAD, }; /** @@ -280,12 +287,14 @@ enum cxl_decoder_mode { * @dpa_res: actively claimed DPA span of this decoder * @skip: offset into @dpa_res where @cxld.hpa_range maps * @mode: which memory type / access-mode-partition this decoder targets + * @pos: interleave position in @cxld.region */ struct cxl_endpoint_decoder { struct cxl_decoder cxld; struct resource *dpa_res; resource_size_t skip; enum cxl_decoder_mode mode; + int pos; }; /** @@ -344,6 +353,8 @@ struct cxl_region_params { int interleave_ways; int interleave_granularity; struct resource *res; + struct cxl_endpoint_decoder *targets[CXL_DECODER_MAX_INTERLEAVE]; + int nr_targets; }; /** From patchwork Fri Jun 24 04:19:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893660 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E14FCCA493 for ; Fri, 24 Jun 2022 04:20:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231228AbiFXEUS (ORCPT ); Fri, 24 Jun 2022 00:20:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229755AbiFXEUO (ORCPT ); Fri, 24 Jun 2022 00:20:14 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DE0A51598; Thu, 23 Jun 2022 21:20:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044414; x=1687580414; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CdACGDCijg9t0Ev44Lk+HSkwOEGVx5BxX7nqS1WZRvY=; b=XxC4oB33HZvaCEfomS69yAquxRe13P74l8UFgqILRc0jAGRgpj+ZFQBV bnwDSwMtHKPh5xJ0UOQHAyVJnanoBevcRNJEZZYEvXfIFUWprkVRrs5RP VrFFOTRgB5ppRb5JJiplKXnZ79KgrkqzvaVxNK+nvItkSL8E3Y3sIvWUx 8YApmhly27+JjxzC/Q27CKxWZyEN/6cBs1kST+i9ScEIwsKdPNn1IqDOt Yx+f3329UIOOZIzGLoFmFiJYziuhZoe01nFpp2ZjnIyWpFInAkXjPowd+ NIguXB6Lfw+5jZETpqnO8IxXYc0XGCiQ2dmLRsMrbwXD8/8tLlrKOL+qQ A==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367238041" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367238041" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:14 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092947" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:13 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Dan Williams Subject: [PATCH 39/46] cxl/acpi: Add a host-bridge index lookup mechanism Date: Thu, 23 Jun 2022 21:19:43 -0700 Message-Id: <20220624041950.559155-14-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The ACPI CXL Fixed Memory Window Structure (CFMWS) defines multiple methods to determine which host bridge provides access to a given endpoint relative to that device's position in the interleave. The "Interleave Arithmetic" defines either a "standard modulo" / round-random algorithm, or "xormap" based algorithm which can be defined as a non-linear transform. Given that there are already more options beyond "standard modulo" and that "xormap" may turn out to be ACPI CXL specific, provide a callback for the region provisioning code to map endpoint positions back to expected host bridge id (cxl_dport target). For now just support the simple modulo math case and save the xormap for a follow-on change. Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- drivers/cxl/core/port.c | 15 +++++++++++++++ drivers/cxl/cxl.h | 2 ++ 2 files changed, 17 insertions(+) diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 562a6453249b..7756409d0a58 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -1422,6 +1422,20 @@ static int decoder_populate_targets(struct cxl_switch_decoder *cxlsd, return rc; } +static struct cxl_dport *cxl_hb_modulo(struct cxl_root_decoder *cxlrd, int pos) +{ + struct cxl_switch_decoder *cxlsd = &cxlrd->cxlsd; + struct cxl_decoder *cxld = &cxlsd->cxld; + int iw; + + iw = cxld->interleave_ways; + if (dev_WARN_ONCE(&cxld->dev, iw != cxlsd->nr_targets, + "misconfigured root decoder\n")) + return NULL; + + return cxlrd->cxlsd.target[pos % iw]; +} + static struct lock_class_key cxl_decoder_key; /** @@ -1466,6 +1480,7 @@ static struct cxl_decoder *cxl_decoder_alloc(struct cxl_port *port, if (rc < 0) goto err; atomic_set(&cxlrd->region_id, rc); + cxlrd->calc_hb = cxl_hb_modulo; } else cxlsd = NULL; } else { diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 9340deccad4f..30227348f768 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -315,11 +315,13 @@ struct cxl_switch_decoder { * struct cxl_root_decoder - Static platform CXL address decoder * @res: host / parent resource for region allocations * @region_id: region id for next region provisioning event + * @calc_hb: which host bridge covers the n'th position by granularity * @cxlsd: base cxl switch decoder */ struct cxl_root_decoder { struct resource *res; atomic_t region_id; + struct cxl_dport *(*calc_hb)(struct cxl_root_decoder *cxlrd, int pos); struct cxl_switch_decoder cxlsd; }; From patchwork Fri Jun 24 04:19:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893664 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03BFBC43334 for ; Fri, 24 Jun 2022 04:20:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230134AbiFXEUV (ORCPT ); Fri, 24 Jun 2022 00:20:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230202AbiFXEUQ (ORCPT ); Fri, 24 Jun 2022 00:20:16 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C59E051E42; Thu, 23 Jun 2022 21:20:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044414; x=1687580414; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=inIN8uups6gFh4YJjaeGxbzSP26ZRDBYb3GSvNZIKQY=; b=LgecnCSmloIk14UCs7/BMalTnNcUmLQ5DIo7UIpf8kV829/0xG31WKbV zVKcr7V5mkx8l5GVlqcjSNzki0whEU1PgmZ2oNvPa+hBrzLYKwe6lgYUF kmMITG4JI0RQZC1xwT6LRpfijuRGlmZfHs326Y+FZkYnqUFRgqjDGXV+A TrrBTjFQBq+8gHskEQJfBtkXBxCT/NxSXm9JFFR9Vt1jvbeKj9y1wMFFZ pm8z30RVzrpixe5SijMQMOZLE32Yj4O1JtHeF8Bp8/MnwliISvKVRTcDX gOa9jfTSJbGwseOMYaSnTTBnHzqUzT/UEDeheLk/88XfuXB7rdkaP515x Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367238044" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367238044" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:14 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092950" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:14 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Dan Williams , Ben Widawsky Subject: [PATCH 40/46] cxl/region: Attach endpoint decoders Date: Thu, 23 Jun 2022 21:19:44 -0700 Message-Id: <20220624041950.559155-15-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org CXL regions (interleave sets) are made up of a set of memory devices where each device maps a portion of the interleave with one of its decoders (see CXL 2.0 8.2.5.12 CXL HDM Decoder Capability Structure). As endpoint decoders are identified by a provisioning tool they can be added to a region provided the region interleave properties are set (way, granularity, HPA) and DPA has been assigned to the decoder. The attach event triggers several validation checks, for example: - is the DPA sized appropriately for the region - is the decoder reachable via the host-bridges identified by the region's root decoder - is the device already active in a different region position slot - are there already regions with a higher HPA active on a given port (per CXL 2.0 8.2.5.12.20 Committing Decoder Programming) ...and the attach event affords an opportunity to collect data and resources relevant to later programming the target lists in switch decoders, for example: - allocate a decoder at each cxl_port in the decode chain - for a given switch port, how many the region's endpoints are hosted through the port - how many unique targets (next hops) does a port need to map to reach those endpoints The act of reconciling this information and deploying it to the decoder configuration is saved for a follow-on patch. Co-developed-by: Ben Widawsky Signed-off-by: Ben Widawsky Signed-off-by: Dan Williams --- drivers/cxl/core/core.h | 7 + drivers/cxl/core/port.c | 10 +- drivers/cxl/core/region.c | 338 +++++++++++++++++++++++++++++++++++++- drivers/cxl/cxl.h | 20 +++ drivers/cxl/cxlmem.h | 5 + 5 files changed, 372 insertions(+), 8 deletions(-) diff --git a/drivers/cxl/core/core.h b/drivers/cxl/core/core.h index 36b6bd8dac2b..0e4e5c2d9452 100644 --- a/drivers/cxl/core/core.h +++ b/drivers/cxl/core/core.h @@ -42,6 +42,13 @@ resource_size_t cxl_dpa_size(struct cxl_endpoint_decoder *cxled); resource_size_t cxl_dpa_resource(struct cxl_endpoint_decoder *cxled); extern struct rw_semaphore cxl_dpa_rwsem; +bool is_switch_decoder(struct device *dev); +static inline struct cxl_ep *cxl_ep_load(struct cxl_port *port, + struct cxl_memdev *cxlmd) +{ + return xa_load(&port->endpoints, (unsigned long)&cxlmd->dev); +} + int cxl_memdev_init(void); void cxl_memdev_exit(void); void cxl_mbox_init(void); diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 7756409d0a58..fde2a2e103d4 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -447,7 +447,7 @@ bool is_root_decoder(struct device *dev) } EXPORT_SYMBOL_NS_GPL(is_root_decoder, CXL); -static bool is_switch_decoder(struct device *dev) +bool is_switch_decoder(struct device *dev) { return is_root_decoder(dev) || dev->type == &cxl_decoder_switch_type; } @@ -503,6 +503,7 @@ static void cxl_port_release(struct device *dev) cxl_ep_remove(port, ep); xa_destroy(&port->endpoints); xa_destroy(&port->dports); + xa_destroy(&port->regions); ida_free(&cxl_port_ida, port->id); kfree(port); } @@ -633,6 +634,7 @@ static struct cxl_port *cxl_port_alloc(struct device *uport, port->dpa_end = -1; xa_init(&port->dports); xa_init(&port->endpoints); + xa_init(&port->regions); device_initialize(dev); lockdep_set_class_and_subclass(&dev->mutex, &cxl_port_key, port->depth); @@ -1110,12 +1112,6 @@ static void reap_dports(struct cxl_port *port) } } -static struct cxl_ep *cxl_ep_load(struct cxl_port *port, - struct cxl_memdev *cxlmd) -{ - return xa_load(&port->endpoints, (unsigned long)&cxlmd->dev); -} - int devm_cxl_add_endpoint(struct cxl_memdev *cxlmd, struct cxl_dport *parent_dport) { diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index 4830365f3857..65bf84abad57 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -428,6 +428,254 @@ static size_t show_targetN(struct cxl_region *cxlr, char *buf, int pos) return rc; } +static int match_free_decoder(struct device *dev, void *data) +{ + struct cxl_decoder *cxld; + int *id = data; + + if (!is_switch_decoder(dev)) + return 0; + + cxld = to_cxl_decoder(dev); + + /* enforce ordered allocation */ + if (cxld->id != *id) + return 0; + + if (!cxld->region) + return 1; + + (*id)++; + + return 0; +} + +static struct cxl_decoder *cxl_region_find_decoder(struct cxl_port *port, + struct cxl_region *cxlr) +{ + struct device *dev; + int id = 0; + + dev = device_find_child(&port->dev, &id, match_free_decoder); + if (!dev) + return NULL; + /* + * This decoder is pinned registered as long as the endpoint decoder is + * registered, and endpoint decoder unregistration holds the + * cxl_region_rwsem over unregister events, so no need to hold on to + * this extra reference. + */ + put_device(dev); + return to_cxl_decoder(dev); +} + +static struct cxl_region_ref *alloc_region_ref(struct cxl_port *port, + struct cxl_region *cxlr) +{ + struct cxl_region_ref *cxl_rr; + + cxl_rr = kzalloc(sizeof(*cxl_rr), GFP_KERNEL); + if (!cxl_rr) + return NULL; + cxl_rr->port = port; + cxl_rr->region = cxlr; + xa_init(&cxl_rr->endpoints); + return cxl_rr; +} + +static void free_region_ref(struct cxl_region_ref *cxl_rr) +{ + struct cxl_port *port = cxl_rr->port; + struct cxl_region *cxlr = cxl_rr->region; + struct cxl_decoder *cxld = cxl_rr->decoder; + + dev_WARN_ONCE(&cxlr->dev, cxld->region != cxlr, "region mismatch\n"); + if (cxld->region == cxlr) { + cxld->region = NULL; + put_device(&cxlr->dev); + } + + xa_erase(&port->regions, (unsigned long)cxlr); + xa_destroy(&cxl_rr->endpoints); + kfree(cxl_rr); +} + +static int cxl_rr_add(struct cxl_region_ref *cxl_rr) +{ + struct cxl_port *port = cxl_rr->port; + struct cxl_region *cxlr = cxl_rr->region; + + return xa_insert(&port->regions, (unsigned long)cxlr, cxl_rr, + GFP_KERNEL); +} + +static int cxl_rr_ep_add(struct cxl_region_ref *cxl_rr, + struct cxl_endpoint_decoder *cxled) +{ + int rc; + struct cxl_port *port = cxl_rr->port; + struct cxl_region *cxlr = cxl_rr->region; + struct cxl_decoder *cxld = cxl_rr->decoder; + struct cxl_ep *ep = cxl_ep_load(port, cxled_to_memdev(cxled)); + + rc = xa_insert(&cxl_rr->endpoints, (unsigned long)cxled, ep, + GFP_KERNEL); + if (rc) + return rc; + cxl_rr->nr_eps++; + + if (!cxld->region) { + cxld->region = cxlr; + get_device(&cxlr->dev); + } + + return 0; +} + +static int cxl_port_attach_region(struct cxl_port *port, + struct cxl_region *cxlr, + struct cxl_endpoint_decoder *cxled, int pos) +{ + struct cxl_memdev *cxlmd = cxled_to_memdev(cxled); + struct cxl_ep *ep = cxl_ep_load(port, cxlmd); + struct cxl_region_ref *cxl_rr = NULL, *iter; + struct cxl_region_params *p = &cxlr->params; + struct cxl_decoder *cxld = NULL; + unsigned long index; + int rc = -EBUSY; + + lockdep_assert_held_write(&cxl_region_rwsem); + + xa_for_each(&port->regions, index, iter) { + struct cxl_region_params *ip = &iter->region->params; + + if (iter->region == cxlr) + cxl_rr = iter; + if (ip->res->start > p->res->start) { + dev_dbg(&cxlr->dev, + "%s: HPA order violation %s:%pr vs %pr\n", + dev_name(&port->dev), + dev_name(&iter->region->dev), ip->res, p->res); + return -EBUSY; + } + } + + if (cxl_rr) { + struct cxl_ep *ep_iter; + int found = 0; + + cxld = cxl_rr->decoder; + xa_for_each(&cxl_rr->endpoints, index, ep_iter) { + if (ep_iter == ep) + continue; + if (ep_iter->next == ep->next) { + found++; + break; + } + } + + /* + * If this is a new target or if this port is direct connected + * to this endpoint then add to the target count. + */ + if (!found || !ep->next) + cxl_rr->nr_targets++; + } else { + cxl_rr = alloc_region_ref(port, cxlr); + if (!cxl_rr) { + dev_dbg(&cxlr->dev, + "%s: failed to allocate region reference\n", + dev_name(&port->dev)); + return -ENOMEM; + } + rc = cxl_rr_add(cxl_rr); + if (rc) { + dev_dbg(&cxlr->dev, + "%s: failed to track region reference\n", + dev_name(&port->dev)); + kfree(cxl_rr); + return rc; + } + } + + if (!cxld) { + if (port == cxled_to_port(cxled)) + cxld = &cxled->cxld; + else + cxld = cxl_region_find_decoder(port, cxlr); + if (!cxld) { + dev_dbg(&cxlr->dev, "%s: no decoder available\n", + dev_name(&port->dev)); + goto out_erase; + } + + if (cxld->region) { + dev_dbg(&cxlr->dev, "%s: %s already attached to %s\n", + dev_name(&port->dev), dev_name(&cxld->dev), + dev_name(&cxld->region->dev)); + rc = -EBUSY; + goto out_erase; + } + + cxl_rr->decoder = cxld; + } + + rc = cxl_rr_ep_add(cxl_rr, cxled); + if (rc) { + dev_dbg(&cxlr->dev, + "%s: failed to track endpoint %s:%s reference\n", + dev_name(&port->dev), dev_name(&cxlmd->dev), + dev_name(&cxld->dev)); + goto out_erase; + } + + return 0; +out_erase: + if (cxl_rr->nr_eps == 0) + free_region_ref(cxl_rr); + return rc; +} + +static struct cxl_region_ref *cxl_rr_load(struct cxl_port *port, + struct cxl_region *cxlr) +{ + return xa_load(&port->regions, (unsigned long)cxlr); +} + +static void cxl_port_detach_region(struct cxl_port *port, + struct cxl_region *cxlr, + struct cxl_endpoint_decoder *cxled) +{ + struct cxl_region_ref *cxl_rr; + struct cxl_ep *ep; + + lockdep_assert_held_write(&cxl_region_rwsem); + + cxl_rr = cxl_rr_load(port, cxlr); + if (!cxl_rr) + return; + + ep = xa_erase(&cxl_rr->endpoints, (unsigned long)cxled); + if (ep) { + struct cxl_ep *ep_iter; + unsigned long index; + int found = 0; + + cxl_rr->nr_eps--; + xa_for_each(&cxl_rr->endpoints, index, ep_iter) { + if (ep_iter->next == ep->next) { + found++; + break; + } + } + if (!found) + cxl_rr->nr_targets--; + } + + if (cxl_rr->nr_eps == 0) + free_region_ref(cxl_rr); +} + /* * - Check that the given endpoint is attached to a host-bridge identified * in the root interleave. @@ -435,14 +683,28 @@ static size_t show_targetN(struct cxl_region *cxlr, char *buf, int pos) static int cxl_region_attach(struct cxl_region *cxlr, struct cxl_endpoint_decoder *cxled, int pos) { + struct cxl_root_decoder *cxlrd = to_cxl_root_decoder(cxlr->dev.parent); + struct cxl_memdev *cxlmd = cxled_to_memdev(cxled); + struct cxl_port *ep_port, *root_port, *iter; struct cxl_region_params *p = &cxlr->params; + struct cxl_dport *dport; + int i, rc = -ENXIO; if (cxled->mode == CXL_DECODER_DEAD) { dev_dbg(&cxlr->dev, "%s dead\n", dev_name(&cxled->cxld.dev)); return -ENODEV; } - if (pos >= p->interleave_ways) { + /* all full of members, or interleave config not established? */ + if (p->state > CXL_CONFIG_INTERLEAVE_ACTIVE) { + dev_dbg(&cxlr->dev, "region already active\n"); + return -EBUSY; + } else if (p->state < CXL_CONFIG_INTERLEAVE_ACTIVE) { + dev_dbg(&cxlr->dev, "interleave config missing\n"); + return -ENXIO; + } + + if (pos < 0 || pos >= p->interleave_ways) { dev_dbg(&cxlr->dev, "position %d out of range %d\n", pos, p->interleave_ways); return -ENXIO; @@ -461,15 +723,83 @@ static int cxl_region_attach(struct cxl_region *cxlr, return -EBUSY; } + for (i = 0; i < p->interleave_ways; i++) { + struct cxl_endpoint_decoder *cxled_target; + struct cxl_memdev *cxlmd_target; + + cxled_target = p->targets[pos]; + if (!cxled_target) + continue; + + cxlmd_target = cxled_to_memdev(cxled_target); + if (cxlmd_target == cxlmd) { + dev_dbg(&cxlr->dev, + "%s already specified at position %d via: %s\n", + dev_name(&cxlmd->dev), pos, + dev_name(&cxled_target->cxld.dev)); + return -EBUSY; + } + } + + ep_port = cxled_to_port(cxled); + root_port = cxlrd_to_port(cxlrd); + dport = cxl_dport_load(root_port, ep_port->host_bridge); + if (!dport) { + dev_dbg(&cxlr->dev, "%s:%s invalid target for %s\n", + dev_name(&cxlmd->dev), dev_name(&cxled->cxld.dev), + dev_name(cxlr->dev.parent)); + return -ENXIO; + } + + if (cxlrd->calc_hb(cxlrd, pos) != dport) { + dev_dbg(&cxlr->dev, "%s:%s invalid target position for %s\n", + dev_name(&cxlmd->dev), dev_name(&cxled->cxld.dev), + dev_name(&cxlrd->cxlsd.cxld.dev)); + return -ENXIO; + } + + if (cxled->cxld.target_type != cxlr->type) { + dev_dbg(&cxlr->dev, "%s:%s type mismatch: %d vs %d\n", + dev_name(&cxlmd->dev), dev_name(&cxled->cxld.dev), + cxled->cxld.target_type, cxlr->type); + return -ENXIO; + } + + if (resource_size(cxled->dpa_res) * p->interleave_ways != + resource_size(p->res)) { + dev_dbg(&cxlr->dev, + "decoder-size-%#llx * ways-%d != region-size-%#llx\n", + (u64)resource_size(cxled->dpa_res), p->interleave_ways, + (u64)resource_size(p->res)); + return -EINVAL; + } + + for (iter = ep_port; !is_cxl_root(iter); + iter = to_cxl_port(iter->dev.parent)) { + rc = cxl_port_attach_region(iter, cxlr, cxled, pos); + if (rc) + goto err; + } + p->targets[pos] = cxled; cxled->pos = pos; p->nr_targets++; + if (p->nr_targets == p->interleave_ways) + p->state = CXL_CONFIG_ACTIVE; + return 0; + +err: + for (iter = ep_port; !is_cxl_root(iter); + iter = to_cxl_port(iter->dev.parent)) + cxl_port_detach_region(iter, cxlr, cxled); + return rc; } static void cxl_region_detach(struct cxl_endpoint_decoder *cxled) { + struct cxl_port *iter, *ep_port = cxled_to_port(cxled); struct cxl_region *cxlr = cxled->cxld.region; struct cxl_region_params *p; @@ -481,6 +811,10 @@ static void cxl_region_detach(struct cxl_endpoint_decoder *cxled) p = &cxlr->params; get_device(&cxlr->dev); + for (iter = ep_port; !is_cxl_root(iter); + iter = to_cxl_port(iter->dev.parent)) + cxl_port_detach_region(iter, cxlr, cxled); + if (cxled->pos < 0 || cxled->pos >= p->interleave_ways || p->targets[cxled->pos] != cxled) { struct cxl_memdev *cxlmd = cxled_to_memdev(cxled); @@ -491,6 +825,8 @@ static void cxl_region_detach(struct cxl_endpoint_decoder *cxled) goto out; } + if (p->state == CXL_CONFIG_ACTIVE) + p->state = CXL_CONFIG_INTERLEAVE_ACTIVE; p->targets[cxled->pos] = NULL; p->nr_targets--; diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 30227348f768..09dbd46cc4c7 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -414,6 +414,7 @@ struct cxl_nvdimm { * @id: id for port device-name * @dports: cxl_dport instances referenced by decoders * @endpoints: cxl_ep instances, endpoints that are a descendant of this port + * @regions: cxl_region_ref instances, regions mapped by this port * @parent_dport: dport that points to this port in the parent * @decoder_ida: allocator for decoder ids * @dpa_end: cursor to track highest allocated decoder for allocation ordering @@ -428,6 +429,7 @@ struct cxl_port { int id; struct xarray dports; struct xarray endpoints; + struct xarray regions; struct cxl_dport *parent_dport; struct ida decoder_ida; int dpa_end; @@ -470,6 +472,24 @@ struct cxl_ep { struct cxl_port *next; }; +/** + * struct cxl_region_ref - track a region's interest in a port + * @port: point in topology to install this reference + * @decoder: decoder assigned for @region in @port + * @region: region for this reference + * @endpoints: cxl_ep references for region members beneath @port + * @nr_eps: number of endpoints beneath @port + * @nr_targets: number of distinct targets needed to reach @nr_eps + */ +struct cxl_region_ref { + struct cxl_port *port; + struct cxl_decoder *decoder; + struct cxl_region *region; + struct xarray endpoints; + int nr_eps; + int nr_targets; +}; + /* * The platform firmware device hosting the root is also the top of the * CXL port topology. All other CXL ports have another CXL port as their diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h index eee96016c3c7..a83bb6782d23 100644 --- a/drivers/cxl/cxlmem.h +++ b/drivers/cxl/cxlmem.h @@ -55,6 +55,11 @@ static inline struct cxl_port *cxled_to_port(struct cxl_endpoint_decoder *cxled) return to_cxl_port(cxled->cxld.dev.parent); } +static inline struct cxl_port *cxlrd_to_port(struct cxl_root_decoder *cxlrd) +{ + return to_cxl_port(cxlrd->cxlsd.cxld.dev.parent); +} + static inline struct cxl_memdev * cxled_to_memdev(struct cxl_endpoint_decoder *cxled) { From patchwork Fri Jun 24 04:19:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893661 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 412E5CCA486 for ; Fri, 24 Jun 2022 04:20:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229737AbiFXEUT (ORCPT ); Fri, 24 Jun 2022 00:20:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230220AbiFXEUQ (ORCPT ); Fri, 24 Jun 2022 00:20:16 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D29F51598; Thu, 23 Jun 2022 21:20:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044415; x=1687580415; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=e+BB+0DDSJ743EF19d/CdcLSz1hlcWUQTIUrMmxfyiE=; b=Y0Sy9PH35LGqvnQwMHb1cTveD4ww+SrlVYlByeBEcTXUVKVQ44NuDbID kw/p0lfolW5Kwi8NK9cEodWYz3ObhX2GUgUsBdOC6mi56TAUas3AghwQz lsmYJNHTNKqGD2dasFKVyngKCL/uSyyAtFTjJGMeNd8dQpfIBrVnzkpqw Mx8/tc/m8jKzbS8glIJ52sEGPqWY0UXnsi7tIsUsgifF96/NcZo1Heqwq uzcmLdK10OSyqosviwJ07d+XP7rNk8ctiPxJ/kgcupnjalO3USGQCoEfK Tw8r2tJvNqPcgszoCPkf83ya5O53npG2/HyM0xKxpLL4u3Z2R5oXsyTN6 w==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367238046" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367238046" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:15 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092953" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:14 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Dan Williams Subject: [PATCH 41/46] cxl/region: Program target lists Date: Thu, 23 Jun 2022 21:19:45 -0700 Message-Id: <20220624041950.559155-16-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Once the region's interleave geometry (ways, granularity, size) is established and all the endpoint decoder targets are assigned, the next phase is to program all the intermediate decoders. Specifically, each CXL switch in the path between the endpoint and its CXL host-bridge (including the logical switch internal to the host-bridge) needs to have its decoders programmed and the target list order assigned. The difficulty in this implementation lies in determining which endpoint decoder ordering combinations are valid. Consider the cxl_test case of 2 host bridges, each of those host-bridges attached to 2 switches, and each of those switches attached to 2 endpoints for a potential 8-way interleave. The x2 interleave at the host-bridge level requires that all even numbered endpoint decoder positions be located on the "left" hand side of the topology tree, and the odd numbered positions on the other. The endpoints that are peers on the same switch need to have a position that can be routed with a dedicated address bit per-endpoint. See check_last_peer() for the details. Signed-off-by: Dan Williams --- drivers/cxl/core/core.h | 4 + drivers/cxl/core/port.c | 4 +- drivers/cxl/core/region.c | 262 ++++++++++++++++++++++++++++++++++++-- drivers/cxl/cxl.h | 2 + 4 files changed, 260 insertions(+), 12 deletions(-) diff --git a/drivers/cxl/core/core.h b/drivers/cxl/core/core.h index 0e4e5c2d9452..6f5c4fb85879 100644 --- a/drivers/cxl/core/core.h +++ b/drivers/cxl/core/core.h @@ -43,9 +43,13 @@ resource_size_t cxl_dpa_resource(struct cxl_endpoint_decoder *cxled); extern struct rw_semaphore cxl_dpa_rwsem; bool is_switch_decoder(struct device *dev); +struct cxl_switch_decoder *to_cxl_switch_decoder(struct device *dev); static inline struct cxl_ep *cxl_ep_load(struct cxl_port *port, struct cxl_memdev *cxlmd) { + if (!port) + return NULL; + return xa_load(&port->endpoints, (unsigned long)&cxlmd->dev); } diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index fde2a2e103d4..7034300e72b2 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -146,8 +146,6 @@ static ssize_t emit_target_list(struct cxl_switch_decoder *cxlsd, char *buf) return offset; } -static struct cxl_switch_decoder *to_cxl_switch_decoder(struct device *dev); - static ssize_t target_list_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -471,7 +469,7 @@ struct cxl_endpoint_decoder *to_cxl_endpoint_decoder(struct device *dev) } EXPORT_SYMBOL_NS_GPL(to_cxl_endpoint_decoder, CXL); -static struct cxl_switch_decoder *to_cxl_switch_decoder(struct device *dev) +struct cxl_switch_decoder *to_cxl_switch_decoder(struct device *dev) { if (dev_WARN_ONCE(dev, !is_switch_decoder(dev), "not a cxl_switch_decoder device\n")) diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index 65bf84abad57..071b8cafe2bb 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -479,6 +479,7 @@ static struct cxl_region_ref *alloc_region_ref(struct cxl_port *port, return NULL; cxl_rr->port = port; cxl_rr->region = cxlr; + cxl_rr->nr_targets = 1; xa_init(&cxl_rr->endpoints); return cxl_rr; } @@ -518,10 +519,12 @@ static int cxl_rr_ep_add(struct cxl_region_ref *cxl_rr, struct cxl_decoder *cxld = cxl_rr->decoder; struct cxl_ep *ep = cxl_ep_load(port, cxled_to_memdev(cxled)); - rc = xa_insert(&cxl_rr->endpoints, (unsigned long)cxled, ep, - GFP_KERNEL); - if (rc) - return rc; + if (ep) { + rc = xa_insert(&cxl_rr->endpoints, (unsigned long)cxled, ep, + GFP_KERNEL); + if (rc) + return rc; + } cxl_rr->nr_eps++; if (!cxld->region) { @@ -537,7 +540,7 @@ static int cxl_port_attach_region(struct cxl_port *port, struct cxl_endpoint_decoder *cxled, int pos) { struct cxl_memdev *cxlmd = cxled_to_memdev(cxled); - struct cxl_ep *ep = cxl_ep_load(port, cxlmd); + const struct cxl_ep *ep = cxl_ep_load(port, cxlmd); struct cxl_region_ref *cxl_rr = NULL, *iter; struct cxl_region_params *p = &cxlr->params; struct cxl_decoder *cxld = NULL; @@ -629,6 +632,16 @@ static int cxl_port_attach_region(struct cxl_port *port, goto out_erase; } + dev_dbg(&cxlr->dev, + "%s:%s %s add: %s:%s @ %d next: %s nr_eps: %d nr_targets: %d\n", + dev_name(port->uport), dev_name(&port->dev), + dev_name(&cxld->dev), dev_name(&cxlmd->dev), + dev_name(&cxled->cxld.dev), pos, + ep ? ep->next ? dev_name(ep->next->uport) : + dev_name(&cxlmd->dev) : + "none", + cxl_rr->nr_eps, cxl_rr->nr_targets); + return 0; out_erase: if (cxl_rr->nr_eps == 0) @@ -647,7 +660,7 @@ static void cxl_port_detach_region(struct cxl_port *port, struct cxl_endpoint_decoder *cxled) { struct cxl_region_ref *cxl_rr; - struct cxl_ep *ep; + struct cxl_ep *ep = NULL; lockdep_assert_held_write(&cxl_region_rwsem); @@ -655,7 +668,14 @@ static void cxl_port_detach_region(struct cxl_port *port, if (!cxl_rr) return; - ep = xa_erase(&cxl_rr->endpoints, (unsigned long)cxled); + /* + * Endpoint ports do not carry cxl_ep references, and they + * never target more than one endpoint by definition + */ + if (cxl_rr->decoder == &cxled->cxld) + cxl_rr->nr_eps--; + else + ep = xa_erase(&cxl_rr->endpoints, (unsigned long)cxled); if (ep) { struct cxl_ep *ep_iter; unsigned long index; @@ -676,6 +696,224 @@ static void cxl_port_detach_region(struct cxl_port *port, free_region_ref(cxl_rr); } +static int check_last_peer(struct cxl_endpoint_decoder *cxled, + struct cxl_ep *ep, struct cxl_region_ref *cxl_rr, + int distance) +{ + struct cxl_memdev *cxlmd = cxled_to_memdev(cxled); + struct cxl_region *cxlr = cxl_rr->region; + struct cxl_region_params *p = &cxlr->params; + struct cxl_endpoint_decoder *cxled_peer; + struct cxl_port *port = cxl_rr->port; + struct cxl_memdev *cxlmd_peer; + struct cxl_ep *ep_peer; + int pos = cxled->pos; + + /* + * If this position wants to share a dport with the last endpoint mapped + * then that endpoint, at index 'position - distance', must also be + * mapped by this dport. + */ + if (pos < distance) { + dev_dbg(&cxlr->dev, "%s:%s: cannot host %s:%s at %d\n", + dev_name(port->uport), dev_name(&port->dev), + dev_name(&cxlmd->dev), dev_name(&cxled->cxld.dev), pos); + return -ENXIO; + } + cxled_peer = p->targets[pos - distance]; + cxlmd_peer = cxled_to_memdev(cxled_peer); + ep_peer = cxl_ep_load(port, cxlmd_peer); + if (ep->dport != ep_peer->dport) { + dev_dbg(&cxlr->dev, + "%s:%s: %s:%s pos %d mismatched peer %s:%s\n", + dev_name(port->uport), dev_name(&port->dev), + dev_name(&cxlmd->dev), dev_name(&cxled->cxld.dev), pos, + dev_name(&cxlmd_peer->dev), + dev_name(&cxled_peer->cxld.dev)); + return -ENXIO; + } + + return 0; +} + +static int cxl_port_setup_targets(struct cxl_port *port, + struct cxl_region *cxlr, + struct cxl_endpoint_decoder *cxled) +{ + struct cxl_root_decoder *cxlrd = to_cxl_root_decoder(cxlr->dev.parent); + int parent_iw, parent_ig, ig, iw, rc, inc = 0, pos = cxled->pos; + struct cxl_port *parent_port = to_cxl_port(port->dev.parent); + struct cxl_region_ref *cxl_rr = cxl_rr_load(port, cxlr); + struct cxl_memdev *cxlmd = cxled_to_memdev(cxled); + struct cxl_ep *ep = cxl_ep_load(port, cxlmd); + struct cxl_region_params *p = &cxlr->params; + struct cxl_decoder *cxld = cxl_rr->decoder; + struct cxl_switch_decoder *cxlsd; + u16 eig, peig; + u8 eiw, peiw; + + /* + * While root level decoders support x3, x6, x12, switch level + * decoders only support powers of 2 up to x16. + */ + if (!is_power_of_2(cxl_rr->nr_targets)) { + dev_dbg(&cxlr->dev, "%s:%s: invalid target count %d\n", + dev_name(port->uport), dev_name(&port->dev), + cxl_rr->nr_targets); + return -EINVAL; + } + + cxlsd = to_cxl_switch_decoder(&cxld->dev); + if (cxl_rr->nr_targets_set) { + int i, distance; + + distance = p->nr_targets / cxl_rr->nr_targets; + for (i = 0; i < cxl_rr->nr_targets_set; i++) + if (ep->dport == cxlsd->target[i]) { + rc = check_last_peer(cxled, ep, cxl_rr, + distance); + if (rc) + return rc; + goto out_target_set; + } + goto add_target; + } + + if (is_cxl_root(parent_port)) { + parent_ig = cxlrd->cxlsd.cxld.interleave_granularity; + parent_iw = cxlrd->cxlsd.cxld.interleave_ways; + /* + * For purposes of address bit routing, use power-of-2 math for + * switch ports. + */ + if (!is_power_of_2(parent_iw)) + parent_iw /= 3; + } else { + struct cxl_region_ref *parent_rr; + struct cxl_decoder *parent_cxld; + + parent_rr = cxl_rr_load(parent_port, cxlr); + parent_cxld = parent_rr->decoder; + parent_ig = parent_cxld->interleave_granularity; + parent_iw = parent_cxld->interleave_ways; + } + + granularity_to_cxl(parent_ig, &peig); + ways_to_cxl(parent_iw, &peiw); + + iw = cxl_rr->nr_targets; + ways_to_cxl(iw, &eiw); + if (cxl_rr->nr_targets > 1) { + u32 address_bit = max(peig + peiw, eiw + peig); + + eig = address_bit - eiw + 1; + } else { + eiw = peiw; + eig = peig; + } + + rc = cxl_to_granularity(eig, &ig); + if (rc) { + dev_dbg(&cxlr->dev, "%s:%s: invalid interleave: %d\n", + dev_name(port->uport), dev_name(&port->dev), + 256 << eig); + return rc; + } + + cxld->interleave_ways = iw; + cxld->interleave_granularity = ig; + dev_dbg(&cxlr->dev, "%s:%s iw: %d ig: %d\n", dev_name(port->uport), + dev_name(&port->dev), iw, ig); +add_target: + if (cxl_rr->nr_targets_set == cxl_rr->nr_targets) { + dev_dbg(&cxlr->dev, + "%s:%s: targets full trying to add %s:%s at %d\n", + dev_name(port->uport), dev_name(&port->dev), + dev_name(&cxlmd->dev), dev_name(&cxled->cxld.dev), pos); + return -ENXIO; + } + cxlsd->target[cxl_rr->nr_targets_set] = ep->dport; + inc = 1; +out_target_set: + cxl_rr->nr_targets_set += inc; + dev_dbg(&cxlr->dev, "%s:%s target[%d] = %s for %s:%s @ %d\n", + dev_name(port->uport), dev_name(&port->dev), + cxl_rr->nr_targets_set - 1, dev_name(ep->dport->dport), + dev_name(&cxlmd->dev), dev_name(&cxled->cxld.dev), pos); + + return 0; +} + +static void cxl_port_reset_targets(struct cxl_port *port, + struct cxl_region *cxlr) +{ + struct cxl_region_ref *cxl_rr = cxl_rr_load(port, cxlr); + + /* + * After the last endpoint has been detached the entire cxl_rr may now + * be gone. + */ + if (cxl_rr) + cxl_rr->nr_targets_set = 0; +} + +static void cxl_region_teardown_targets(struct cxl_region *cxlr) +{ + struct cxl_region_params *p = &cxlr->params; + struct cxl_endpoint_decoder *cxled; + struct cxl_memdev *cxlmd; + struct cxl_port *iter; + struct cxl_ep *ep; + int i; + + for (i = 0; i < p->nr_targets; i++) { + cxled = p->targets[i]; + cxlmd = cxled_to_memdev(cxled); + + iter = cxled_to_port(cxled); + while (!is_cxl_root(to_cxl_port(iter->dev.parent))) + iter = to_cxl_port(iter->dev.parent); + + for (ep = cxl_ep_load(iter, cxlmd); iter; + iter = ep->next, ep = cxl_ep_load(iter, cxlmd)) + cxl_port_reset_targets(iter, cxlr); + } +} + +static int cxl_region_setup_targets(struct cxl_region *cxlr) +{ + struct cxl_region_params *p = &cxlr->params; + struct cxl_endpoint_decoder *cxled; + struct cxl_memdev *cxlmd; + struct cxl_port *iter; + struct cxl_ep *ep; + int i, rc; + + for (i = 0; i < p->nr_targets; i++) { + cxled = p->targets[i]; + cxlmd = cxled_to_memdev(cxled); + + iter = cxled_to_port(cxled); + while (!is_cxl_root(to_cxl_port(iter->dev.parent))) + iter = to_cxl_port(iter->dev.parent); + + /* + * Descend the topology tree programming targets while + * looking for conflicts. + */ + for (ep = cxl_ep_load(iter, cxlmd); iter; + iter = ep->next, ep = cxl_ep_load(iter, cxlmd)) { + rc = cxl_port_setup_targets(iter, cxlr, cxled); + if (rc) { + cxl_region_teardown_targets(cxlr); + return rc; + } + } + } + + return 0; +} + /* * - Check that the given endpoint is attached to a host-bridge identified * in the root interleave. @@ -785,8 +1023,12 @@ static int cxl_region_attach(struct cxl_region *cxlr, cxled->pos = pos; p->nr_targets++; - if (p->nr_targets == p->interleave_ways) + if (p->nr_targets == p->interleave_ways) { + rc = cxl_region_setup_targets(cxlr); + if (rc) + goto err; p->state = CXL_CONFIG_ACTIVE; + } return 0; @@ -825,8 +1067,10 @@ static void cxl_region_detach(struct cxl_endpoint_decoder *cxled) goto out; } - if (p->state == CXL_CONFIG_ACTIVE) + if (p->state == CXL_CONFIG_ACTIVE) { p->state = CXL_CONFIG_INTERLEAVE_ACTIVE; + cxl_region_teardown_targets(cxlr); + } p->targets[cxled->pos] = NULL; p->nr_targets--; diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 09dbd46cc4c7..a93d7c4efd1a 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -478,6 +478,7 @@ struct cxl_ep { * @decoder: decoder assigned for @region in @port * @region: region for this reference * @endpoints: cxl_ep references for region members beneath @port + * @nr_targets_set: track how many targets have been programmed during setup * @nr_eps: number of endpoints beneath @port * @nr_targets: number of distinct targets needed to reach @nr_eps */ @@ -486,6 +487,7 @@ struct cxl_region_ref { struct cxl_decoder *decoder; struct cxl_region *region; struct xarray endpoints; + int nr_targets_set; int nr_eps; int nr_targets; }; From patchwork Fri Jun 24 04:19:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893663 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B06A9CCA489 for ; Fri, 24 Jun 2022 04:20:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230220AbiFXEUW (ORCPT ); Fri, 24 Jun 2022 00:20:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229981AbiFXEUR (ORCPT ); Fri, 24 Jun 2022 00:20:17 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 825B253A53; Thu, 23 Jun 2022 21:20:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044415; x=1687580415; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GD0fI9W169kNkPUeklMh94ytuqKPsBZlYoI0XMrAxAs=; b=NjLFlHgmbLQP1N4FJRJWkksUbvduNbzYF89Usy/V8WvLj5iNEFpBXNk4 fQRJ1onLGzs/HpXlX+DxWx6qUEnC2v3OrIhHjhqQP7vfp3KLM2n3elpDF 8Lmoio+fR94Mm7ujSDKv04gNjikVOg1aZq/6eHyGX+roWoJlvqMAH2vOq H0mKkAtmRDbnca1TSPSqpDTBhVdBEU6M7rY4pd+u6vmRjUPBI/hXpAuOi u3aByCUJP5CSI6ZGtjY8mowyyUN/Oz70JcKTZfQyWM/J76/llbeMNIluw 9Bf/S7PTl+VEfENj00FIuX8OI2Y8L+VgAU7ZVOm1VXzLh/hQz9AcjqsXq g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367238051" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367238051" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:15 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092958" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:15 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Dan Williams Subject: [PATCH 42/46] cxl/hdm: Commit decoder state to hardware Date: Thu, 23 Jun 2022 21:19:46 -0700 Message-Id: <20220624041950.559155-17-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org After all the soft validation of the region has completed, convey the region configuration to hardware while being careful to commit decoders in specification mandated order. In addition to programming the endpoint decoder base-addres, intereleave ways and granularity, the switch decoder target lists are also established. While the kernel can enforce spec-mandated commit order, it can not enforce spec-mandated reset order. For example, the kernel can't stop someone from removing an endpoint device that is occupying decoderN in a switch decoder where decoderN+1 is also committed. To reset decoderN, decoderN+1 must be torn down first. That "tear down the world" implementation is saved for a follow-on patch. Callback operations are provided for the 'commit' and 'reset' operations. While those callbacks may prove useful for CXL accelerators (Type-2 devices with memory) the primary motivation is to enable a simple way for cxl_test to intercept those operations. Signed-off-by: Dan Williams --- Documentation/ABI/testing/sysfs-bus-cxl | 16 ++ drivers/cxl/core/hdm.c | 218 ++++++++++++++++++++++++ drivers/cxl/core/port.c | 1 + drivers/cxl/core/region.c | 189 ++++++++++++++++++-- drivers/cxl/cxl.h | 11 ++ tools/testing/cxl/test/cxl.c | 46 +++++ 6 files changed, 471 insertions(+), 10 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-bus-cxl b/Documentation/ABI/testing/sysfs-bus-cxl index f1b74a71927d..0debe2955f34 100644 --- a/Documentation/ABI/testing/sysfs-bus-cxl +++ b/Documentation/ABI/testing/sysfs-bus-cxl @@ -338,3 +338,19 @@ Description: not an endpoint decoder. Once all positions have been successfully written a final validation for decode conflicts is performed before activating the region. + + +What: /sys/bus/cxl/devices/regionZ/commit +Date: May, 2022 +KernelVersion: v5.20 +Contact: linux-cxl@vger.kernel.org +Description: + (RW) Write a boolean 'true' string value to this attribute to + trigger the region to transition from the software programmed + state to the actively decoding in hardware state. The commit + operation in addition to validating that the region is in proper + configured state, validates that the decoders are being + committed in spec mandated order (last committed decoder id + + 1), and checks that the hardware accepts the commit request. + Reading this value indicates whether the region is committed or + not. diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index 2ee62dde8b23..72f98f1a782c 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -129,6 +129,8 @@ struct cxl_hdm *devm_cxl_setup_hdm(struct cxl_port *port) return ERR_PTR(-ENXIO); } + dev_set_drvdata(&port->dev, cxlhdm); + return cxlhdm; } EXPORT_SYMBOL_NS_GPL(devm_cxl_setup_hdm, CXL); @@ -444,6 +446,213 @@ int cxl_dpa_alloc(struct cxl_endpoint_decoder *cxled, unsigned long long size) return devm_add_action_or_reset(&port->dev, cxl_dpa_release, cxled); } +static void cxld_set_interleave(struct cxl_decoder *cxld, u32 *ctrl) +{ + u16 eig; + u8 eiw; + + ways_to_cxl(cxld->interleave_ways, &eiw); + granularity_to_cxl(cxld->interleave_granularity, &eig); + + u32p_replace_bits(ctrl, eig, CXL_HDM_DECODER0_CTRL_IG_MASK); + u32p_replace_bits(ctrl, eiw, CXL_HDM_DECODER0_CTRL_IW_MASK); + *ctrl |= CXL_HDM_DECODER0_CTRL_COMMIT; +} + +static void cxld_set_type(struct cxl_decoder *cxld, u32 *ctrl) +{ + u32p_replace_bits(ctrl, !!(cxld->target_type == 3), + CXL_HDM_DECODER0_CTRL_TYPE); +} + +static void cxld_set_hpa(struct cxl_decoder *cxld, u64 *base, u64 *size) +{ + struct cxl_region *cxlr = cxld->region; + struct cxl_region_params *p = &cxlr->params; + + cxld->hpa_range = (struct range) { + .start = p->res->start, + .end = p->res->end, + }; + + *base = p->res->start; + *size = resource_size(p->res); +} + +static void cxld_clear_hpa(struct cxl_decoder *cxld) +{ + cxld->hpa_range = (struct range) { + .start = 0, + .end = -1, + }; +} + +static int cxlsd_set_targets(struct cxl_switch_decoder *cxlsd, u64 *tgt) +{ + struct cxl_dport **t = &cxlsd->target[0]; + int ways = cxlsd->cxld.interleave_ways; + + if (dev_WARN_ONCE(&cxlsd->cxld.dev, + ways > 8 || ways > cxlsd->nr_targets, + "ways: %d overflows targets: %d\n", ways, + cxlsd->nr_targets)) + return -ENXIO; + + *tgt = FIELD_PREP(GENMASK(7, 0), t[0]->port_id); + if (ways > 1) + *tgt |= FIELD_PREP(GENMASK(15, 8), t[1]->port_id); + if (ways > 2) + *tgt |= FIELD_PREP(GENMASK(23, 16), t[2]->port_id); + if (ways > 3) + *tgt |= FIELD_PREP(GENMASK(31, 24), t[3]->port_id); + if (ways > 4) + *tgt |= FIELD_PREP(GENMASK_ULL(39, 32), t[4]->port_id); + if (ways > 5) + *tgt |= FIELD_PREP(GENMASK_ULL(47, 40), t[5]->port_id); + if (ways > 6) + *tgt |= FIELD_PREP(GENMASK_ULL(55, 48), t[6]->port_id); + if (ways > 7) + *tgt |= FIELD_PREP(GENMASK_ULL(63, 56), t[7]->port_id); + + return 0; +} + +/* + * Per CXL 2.0 8.2.5.12.20 Committing Decoder Programming, hardware must set + * committed or error within 10ms, but just be generous with 20ms to account for + * clock skew and other marginal behavior + */ +#define COMMIT_TIMEOUT_MS 20 +static int cxld_await_commit(void __iomem *hdm, int id) +{ + u32 ctrl; + int i; + + for (i = 0; i < COMMIT_TIMEOUT_MS; i++) { + ctrl = readl(hdm + CXL_HDM_DECODER0_CTRL_OFFSET(id)); + if (FIELD_GET(CXL_HDM_DECODER0_CTRL_COMMIT_ERROR, ctrl)) { + ctrl &= ~CXL_HDM_DECODER0_CTRL_COMMIT; + writel(ctrl, hdm + CXL_HDM_DECODER0_CTRL_OFFSET(id)); + return -EIO; + } + if (FIELD_GET(CXL_HDM_DECODER0_CTRL_COMMITTED, ctrl)) + return 0; + fsleep(1000); + } + + return -ETIMEDOUT; +} + +static int cxl_decoder_commit(struct cxl_decoder *cxld) +{ + struct cxl_port *port = to_cxl_port(cxld->dev.parent); + struct cxl_hdm *cxlhdm = dev_get_drvdata(&port->dev); + void __iomem *hdm = cxlhdm->regs.hdm_decoder; + int id = cxld->id, rc; + u64 base, size; + u32 ctrl; + + if (cxld->flags & CXL_DECODER_F_ENABLE) + return 0; + + if (port->commit_end + 1 != id) { + dev_dbg(&port->dev, + "%s: out of order commit, expected decoder%d.%d\n", + dev_name(&cxld->dev), port->id, port->commit_end + 1); + return -EBUSY; + } + + down_read(&cxl_dpa_rwsem); + /* common decoder settings */ + ctrl = readl(hdm + CXL_HDM_DECODER0_CTRL_OFFSET(cxld->id)); + cxld_set_interleave(cxld, &ctrl); + cxld_set_type(cxld, &ctrl); + cxld_set_hpa(cxld, &base, &size); + + writel(upper_32_bits(base), hdm + CXL_HDM_DECODER0_BASE_HIGH_OFFSET(id)); + writel(lower_32_bits(base), hdm + CXL_HDM_DECODER0_BASE_LOW_OFFSET(id)); + writel(upper_32_bits(size), hdm + CXL_HDM_DECODER0_SIZE_HIGH_OFFSET(id)); + writel(lower_32_bits(size), hdm + CXL_HDM_DECODER0_SIZE_LOW_OFFSET(id)); + + if (is_switch_decoder(&cxld->dev)) { + struct cxl_switch_decoder *cxlsd = + to_cxl_switch_decoder(&cxld->dev); + void __iomem *tl_hi = hdm + CXL_HDM_DECODER0_TL_HIGH(id); + void __iomem *tl_lo = hdm + CXL_HDM_DECODER0_TL_LOW(id); + u64 targets; + + rc = cxlsd_set_targets(cxlsd, &targets); + if (rc) { + dev_dbg(&port->dev, "%s: target configuration error\n", + dev_name(&cxld->dev)); + goto err; + } + + writel(upper_32_bits(targets), tl_hi); + writel(lower_32_bits(targets), tl_lo); + } else { + struct cxl_endpoint_decoder *cxled = + to_cxl_endpoint_decoder(&cxld->dev); + void __iomem *sk_hi = hdm + CXL_HDM_DECODER0_SKIP_HIGH(id); + void __iomem *sk_lo = hdm + CXL_HDM_DECODER0_SKIP_LOW(id); + + writel(upper_32_bits(cxled->skip), sk_hi); + writel(lower_32_bits(cxled->skip), sk_lo); + } + + writel(ctrl, hdm + CXL_HDM_DECODER0_CTRL_OFFSET(id)); + up_read(&cxl_dpa_rwsem); + + port->commit_end++; + rc = cxld_await_commit(hdm, cxld->id); +err: + if (rc) { + dev_dbg(&port->dev, "%s: error %d committing decoder\n", + dev_name(&cxld->dev), rc); + cxld->reset(cxld); + return rc; + } + cxld->flags |= CXL_DECODER_F_ENABLE; + + return 0; +} + +static int cxl_decoder_reset(struct cxl_decoder *cxld) +{ + struct cxl_port *port = to_cxl_port(cxld->dev.parent); + struct cxl_hdm *cxlhdm = dev_get_drvdata(&port->dev); + void __iomem *hdm = cxlhdm->regs.hdm_decoder; + int id = cxld->id; + u32 ctrl; + + if ((cxld->flags & CXL_DECODER_F_ENABLE) == 0) + return 0; + + if (port->commit_end != id) { + dev_dbg(&port->dev, + "%s: out of order reset, expected decoder%d.%d\n", + dev_name(&cxld->dev), port->id, port->commit_end); + return -EBUSY; + } + + down_read(&cxl_dpa_rwsem); + ctrl = readl(hdm + CXL_HDM_DECODER0_CTRL_OFFSET(id)); + ctrl &= ~CXL_HDM_DECODER0_CTRL_COMMIT; + writel(ctrl, hdm + CXL_HDM_DECODER0_CTRL_OFFSET(id)); + + cxld_clear_hpa(cxld); + writel(0, hdm + CXL_HDM_DECODER0_SIZE_HIGH_OFFSET(id)); + writel(0, hdm + CXL_HDM_DECODER0_SIZE_LOW_OFFSET(id)); + writel(0, hdm + CXL_HDM_DECODER0_BASE_HIGH_OFFSET(id)); + writel(0, hdm + CXL_HDM_DECODER0_BASE_LOW_OFFSET(id)); + up_read(&cxl_dpa_rwsem); + + port->commit_end--; + cxld->flags &= ~CXL_DECODER_F_ENABLE; + + return 0; +} + static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, int *target_map, void __iomem *hdm, int which, u64 *dpa_base) @@ -466,6 +675,8 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, base = ioread64_hi_lo(hdm + CXL_HDM_DECODER0_BASE_LOW_OFFSET(which)); size = ioread64_hi_lo(hdm + CXL_HDM_DECODER0_SIZE_LOW_OFFSET(which)); committed = !!(ctrl & CXL_HDM_DECODER0_CTRL_COMMITTED); + cxld->commit = cxl_decoder_commit; + cxld->reset = cxl_decoder_reset; if (!committed) size = 0; @@ -489,6 +700,13 @@ static int init_hdm_decoder(struct cxl_port *port, struct cxl_decoder *cxld, cxld->target_type = CXL_DECODER_EXPANDER; else cxld->target_type = CXL_DECODER_ACCELERATOR; + if (cxld->id != port->commit_end + 1) { + dev_warn(&port->dev, + "decoder%d.%d: Committed out of order\n", + port->id, cxld->id); + return -ENXIO; + } + port->commit_end = cxld->id; } else { /* unless / until type-2 drivers arrive, assume type-3 */ if (FIELD_GET(CXL_HDM_DECODER0_CTRL_TYPE, ctrl) == 0) { diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 7034300e72b2..eee1615d2319 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -630,6 +630,7 @@ static struct cxl_port *cxl_port_alloc(struct device *uport, port->component_reg_phys = component_reg_phys; ida_init(&port->decoder_ida); port->dpa_end = -1; + port->commit_end = -1; xa_init(&port->dports); xa_init(&port->endpoints); xa_init(&port->regions); diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index 071b8cafe2bb..b90160c4f975 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -112,6 +112,168 @@ static ssize_t uuid_store(struct device *dev, struct device_attribute *attr, } static DEVICE_ATTR_RW(uuid); +static struct cxl_region_ref *cxl_rr_load(struct cxl_port *port, + struct cxl_region *cxlr) +{ + return xa_load(&port->regions, (unsigned long)cxlr); +} + +static int cxl_region_decode_reset(struct cxl_region *cxlr, int count) +{ + struct cxl_region_params *p = &cxlr->params; + int i; + + for (i = count - 1; i >= 0; i--) { + struct cxl_endpoint_decoder *cxled = p->targets[i]; + struct cxl_memdev *cxlmd = cxled_to_memdev(cxled); + struct cxl_port *iter = cxled_to_port(cxled); + struct cxl_ep *ep; + int rc; + + while (!is_cxl_root(to_cxl_port(iter->dev.parent))) + iter = to_cxl_port(iter->dev.parent); + + for (ep = cxl_ep_load(iter, cxlmd); iter; + iter = ep->next, ep = cxl_ep_load(iter, cxlmd)) { + struct cxl_region_ref *cxl_rr; + struct cxl_decoder *cxld; + + cxl_rr = cxl_rr_load(iter, cxlr); + cxld = cxl_rr->decoder; + rc = cxld->reset(cxld); + if (rc) + return rc; + } + + rc = cxled->cxld.reset(&cxled->cxld); + if (rc) + return rc; + } + + return 0; +} + +static int cxl_region_decode_commit(struct cxl_region *cxlr) +{ + struct cxl_region_params *p = &cxlr->params; + int i, rc; + + for (i = 0; i < p->nr_targets; i++) { + struct cxl_endpoint_decoder *cxled = p->targets[i]; + struct cxl_memdev *cxlmd = cxled_to_memdev(cxled); + struct cxl_region_ref *cxl_rr; + struct cxl_decoder *cxld; + struct cxl_port *iter; + struct cxl_ep *ep; + + /* commit bottom up */ + for (iter = cxled_to_port(cxled); !is_cxl_root(iter); + iter = to_cxl_port(iter->dev.parent)) { + cxl_rr = cxl_rr_load(iter, cxlr); + cxld = cxl_rr->decoder; + rc = cxld->commit(cxld); + if (rc) + break; + } + + if (is_cxl_root(iter)) + continue; + + /* teardown top down */ + for (ep = cxl_ep_load(iter, cxlmd); ep && iter; + iter = ep->next, ep = cxl_ep_load(iter, cxlmd)) { + cxl_rr = cxl_rr_load(iter, cxlr); + cxld = cxl_rr->decoder; + cxld->reset(cxld); + } + + cxled->cxld.reset(&cxled->cxld); + if (i == 0) + return rc; + break; + } + + if (i >= p->nr_targets) + return 0; + + /* undo the targets that were successfully committed */ + cxl_region_decode_reset(cxlr, i); + return rc; +} + +static ssize_t commit_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t len) +{ + struct cxl_region *cxlr = to_cxl_region(dev); + struct cxl_region_params *p = &cxlr->params; + bool commit; + ssize_t rc; + + rc = kstrtobool(buf, &commit); + if (rc) + return rc; + + rc = down_write_killable(&cxl_region_rwsem); + if (rc) + return rc; + + /* Already in the requested state? */ + if (commit && p->state >= CXL_CONFIG_COMMIT) + goto out; + if (!commit && p->state < CXL_CONFIG_COMMIT) + goto out; + + /* Not ready to commit? */ + if (commit && p->state < CXL_CONFIG_ACTIVE) { + rc = -ENXIO; + goto out; + } + + if (commit) + rc = cxl_region_decode_commit(cxlr); + else { + p->state = CXL_CONFIG_RESET_PENDING; + up_write(&cxl_region_rwsem); + device_release_driver(&cxlr->dev); + down_write(&cxl_region_rwsem); + + if (p->state == CXL_CONFIG_RESET_PENDING) + rc = cxl_region_decode_reset(cxlr, p->interleave_ways); + } + + if (rc) + goto out; + + if (commit) + p->state = CXL_CONFIG_COMMIT; + else if (p->state == CXL_CONFIG_RESET_PENDING) + p->state = CXL_CONFIG_ACTIVE; + +out: + up_write(&cxl_region_rwsem); + + if (rc) + return rc; + return len; +} + +static ssize_t commit_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct cxl_region *cxlr = to_cxl_region(dev); + struct cxl_region_params *p = &cxlr->params; + ssize_t rc; + + rc = down_read_interruptible(&cxl_region_rwsem); + if (rc) + return rc; + rc = sysfs_emit(buf, "%d\n", p->state >= CXL_CONFIG_COMMIT); + up_read(&cxl_region_rwsem); + + return rc; +} +static DEVICE_ATTR_RW(commit); + static umode_t cxl_region_visible(struct kobject *kobj, struct attribute *a, int n) { @@ -388,6 +550,7 @@ static DEVICE_ATTR_RW(size); static struct attribute *cxl_region_attrs[] = { &dev_attr_uuid.attr, + &dev_attr_commit.attr, &dev_attr_interleave_ways.attr, &dev_attr_interleave_granularity.attr, &dev_attr_resource.attr, @@ -649,12 +812,6 @@ static int cxl_port_attach_region(struct cxl_port *port, return rc; } -static struct cxl_region_ref *cxl_rr_load(struct cxl_port *port, - struct cxl_region *cxlr) -{ - return xa_load(&port->regions, (unsigned long)cxlr); -} - static void cxl_port_detach_region(struct cxl_port *port, struct cxl_region *cxlr, struct cxl_endpoint_decoder *cxled) @@ -1039,20 +1196,32 @@ static int cxl_region_attach(struct cxl_region *cxlr, return rc; } -static void cxl_region_detach(struct cxl_endpoint_decoder *cxled) +static int cxl_region_detach(struct cxl_endpoint_decoder *cxled) { struct cxl_port *iter, *ep_port = cxled_to_port(cxled); struct cxl_region *cxlr = cxled->cxld.region; struct cxl_region_params *p; + int rc = 0; lockdep_assert_held_write(&cxl_region_rwsem); if (!cxlr) - return; + return 0; p = &cxlr->params; get_device(&cxlr->dev); + if (p->state > CXL_CONFIG_ACTIVE) { + /* + * TODO: tear down all impacted regions if a device is + * removed out of order + */ + rc = cxl_region_decode_reset(cxlr, p->interleave_ways); + if (rc) + goto out; + p->state = CXL_CONFIG_ACTIVE; + } + for (iter = ep_port; !is_cxl_root(iter); iter = to_cxl_port(iter->dev.parent)) cxl_port_detach_region(iter, cxlr, cxled); @@ -1080,6 +1249,7 @@ static void cxl_region_detach(struct cxl_endpoint_decoder *cxled) down_write(&cxl_region_rwsem); out: put_device(&cxlr->dev); + return rc; } void cxl_decoder_kill_region(struct cxl_endpoint_decoder *cxled) @@ -1137,8 +1307,7 @@ static int detach_target(struct cxl_region *cxlr, int pos) goto out; } - cxl_region_detach(p->targets[pos]); - rc = 0; + rc = cxl_region_detach(p->targets[pos]); out: up_write(&cxl_region_rwsem); return rc; diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index a93d7c4efd1a..fc14f6805f2c 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -54,6 +54,7 @@ #define CXL_HDM_DECODER0_CTRL_LOCK BIT(8) #define CXL_HDM_DECODER0_CTRL_COMMIT BIT(9) #define CXL_HDM_DECODER0_CTRL_COMMITTED BIT(10) +#define CXL_HDM_DECODER0_CTRL_COMMIT_ERROR BIT(11) #define CXL_HDM_DECODER0_CTRL_TYPE BIT(12) #define CXL_HDM_DECODER0_TL_LOW(i) (0x20 * (i) + 0x24) #define CXL_HDM_DECODER0_TL_HIGH(i) (0x20 * (i) + 0x28) @@ -257,6 +258,8 @@ enum cxl_decoder_type { * @target_type: accelerator vs expander (type2 vs type3) selector * @region: currently assigned region for this decoder * @flags: memory type capabilities and locking + * @commit: device/decoder-type specific callback to commit settings to hw + * @commit: device/decoder-type specific callback to reset hw settings */ struct cxl_decoder { struct device dev; @@ -267,6 +270,8 @@ struct cxl_decoder { enum cxl_decoder_type target_type; struct cxl_region *region; unsigned long flags; + int (*commit)(struct cxl_decoder *cxld); + int (*reset)(struct cxl_decoder *cxld); }; /* @@ -332,11 +337,15 @@ struct cxl_root_decoder { * changes to interleave_ways or interleave_granularity * @CXL_CONFIG_ACTIVE: All targets have been added the region is now * active + * @CXL_CONFIG_RESET_PENDING: see commit_store() + * @CXL_CONFIG_COMMIT: Soft-config has been committed to hardware */ enum cxl_config_state { CXL_CONFIG_IDLE, CXL_CONFIG_INTERLEAVE_ACTIVE, CXL_CONFIG_ACTIVE, + CXL_CONFIG_RESET_PENDING, + CXL_CONFIG_COMMIT, }; /** @@ -418,6 +427,7 @@ struct cxl_nvdimm { * @parent_dport: dport that points to this port in the parent * @decoder_ida: allocator for decoder ids * @dpa_end: cursor to track highest allocated decoder for allocation ordering + * @commit_end: cursor to track highest committed decoder for commit ordering * @component_reg_phys: component register capability base address (optional) * @dead: last ep has been removed, force port re-creation * @depth: How deep this port is relative to the root. depth 0 is the root. @@ -433,6 +443,7 @@ struct cxl_port { struct cxl_dport *parent_dport; struct ida decoder_ida; int dpa_end; + int commit_end; resource_size_t component_reg_phys; bool dead; unsigned int depth; diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c index 51d517fa62ee..94653201631c 100644 --- a/tools/testing/cxl/test/cxl.c +++ b/tools/testing/cxl/test/cxl.c @@ -429,6 +429,50 @@ static int map_targets(struct device *dev, void *data) return 0; } +static int mock_decoder_commit(struct cxl_decoder *cxld) +{ + struct cxl_port *port = to_cxl_port(cxld->dev.parent); + int id = cxld->id; + + if (cxld->flags & CXL_DECODER_F_ENABLE) + return 0; + + dev_dbg(&port->dev, "%s commit\n", dev_name(&cxld->dev)); + if (port->commit_end + 1 != id) { + dev_dbg(&port->dev, + "%s: out of order commit, expected decoder%d.%d\n", + dev_name(&cxld->dev), port->id, port->commit_end + 1); + return -EBUSY; + } + + port->commit_end++; + cxld->flags |= CXL_DECODER_F_ENABLE; + + return 0; +} + +static int mock_decoder_reset(struct cxl_decoder *cxld) +{ + struct cxl_port *port = to_cxl_port(cxld->dev.parent); + int id = cxld->id; + + if ((cxld->flags & CXL_DECODER_F_ENABLE) == 0) + return 0; + + dev_dbg(&port->dev, "%s reset\n", dev_name(&cxld->dev)); + if (port->commit_end != id) { + dev_dbg(&port->dev, + "%s: out of order reset, expected decoder%d.%d\n", + dev_name(&cxld->dev), port->id, port->commit_end); + return -EBUSY; + } + + port->commit_end--; + cxld->flags &= ~CXL_DECODER_F_ENABLE; + + return 0; +} + static int mock_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) { struct cxl_port *port = cxlhdm->port; @@ -482,6 +526,8 @@ static int mock_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm) cxld->interleave_ways = min_not_zero(target_count, 1); cxld->interleave_granularity = SZ_4K; cxld->target_type = CXL_DECODER_EXPANDER; + cxld->commit = mock_decoder_commit; + cxld->reset = mock_decoder_reset; if (target_count) { rc = device_for_each_child(port->uport, &ctx, From patchwork Fri Jun 24 04:19:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893665 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E70DCC433EF for ; Fri, 24 Jun 2022 04:20:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231144AbiFXEU3 (ORCPT ); Fri, 24 Jun 2022 00:20:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229914AbiFXEUS (ORCPT ); Fri, 24 Jun 2022 00:20:18 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB0CA54F99; Thu, 23 Jun 2022 21:20:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044416; x=1687580416; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YRGxWHwlR2WZVbAJ2E0KYhXzmo8P1xJMN8Lfvbu4eD0=; b=mbasr8c9w9GJioPCd1GSSQFqsHOE9jYWs7uvKOoVrCw8WvSXQkamHfTJ 5vrIZQjSAw3W/vVa2n4wswXw/wcMUcWtuBn3jM/LTg069jTAdzyOJletB ZrVohCr6nXC26iAtTWAn9QVuGgBC2PmAMACk4Ia5Zc/a/tTdcIPVmkayV swVoIozL5srWJTTv8H04iECA2tyA5x2mVPRRUx13/6g6abuSVP1PGR4yL +B8Z9iIQU+WZKUl42ILfa9kfXl7NCNe+tbR+QScQuzLtvAibqoedVQdjI Kg/TekvbhWGw/0mgMW26W5O3gor116+sjrlWqtVz2hywH7fAyDB/0x3iY w==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367238055" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367238055" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:15 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092962" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:15 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Dan Williams , Ben Widawsky Subject: [PATCH 43/46] cxl/region: Add region driver boiler plate Date: Thu, 23 Jun 2022 21:19:47 -0700 Message-Id: <20220624041950.559155-18-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The CXL region driver is responsible for routing fully formed CXL regions to one of libnvdimm, for persistent memory regions, device-dax for volatile memory regions, or just act as an enumeration placeholder if the region was setup and configuration locked by platform firmware. In the platform-firmware-setup case the expectation is that region is already accounted in the system memory map, i.e. already enabled as "System RAM". For now, just attach to CXL regions in the CXL_CONFIG_COMMIT state, and take no further action. Given this driver is just a small / simple router, include it in the core rather than its own module. Co-developed-by: Ben Widawsky Signed-off-by: Ben Widawsky Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- drivers/cxl/core/core.h | 12 +++++++++++ drivers/cxl/core/port.c | 9 ++++++++ drivers/cxl/core/region.c | 45 ++++++++++++++++++++++++++++++++++++++- drivers/cxl/cxl.h | 1 + 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/drivers/cxl/core/core.h b/drivers/cxl/core/core.h index 6f5c4fb85879..be5198ab8f3b 100644 --- a/drivers/cxl/core/core.h +++ b/drivers/cxl/core/core.h @@ -13,17 +13,29 @@ extern struct attribute_group cxl_base_attribute_group; extern struct device_attribute dev_attr_create_pmem_region; extern struct device_attribute dev_attr_delete_region; extern struct device_attribute dev_attr_region; +extern const struct device_type cxl_region_type; void cxl_decoder_kill_region(struct cxl_endpoint_decoder *cxled); +int cxl_region_init(void); +void cxl_region_exit(void); /* * Note must be used at the end of an attribute list, since it * terminates the list in the CONFIG_CXL_REGION=n case. */ #define CXL_REGION_ATTR(x) (&dev_attr_##x.attr) +#define CXL_REGION_TYPE(x) (&cxl_region_type) #else static inline void cxl_decoder_kill_region(struct cxl_endpoint_decoder *cxled) { } +static inline int cxl_region_init(void) +{ + return 0; +} +static inline void cxl_region_exit(void) +{ +} #define CXL_REGION_ATTR(x) NULL +#define CXL_REGION_TYPE(x) NULL #endif struct cxl_send_command; diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index eee1615d2319..00add9e0b192 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -51,6 +51,8 @@ static int cxl_device_id(struct device *dev) } if (is_cxl_memdev(dev)) return CXL_DEVICE_MEMORY_EXPANDER; + if (dev->type == CXL_REGION_TYPE()) + return CXL_DEVICE_REGION; return 0; } @@ -1867,8 +1869,14 @@ static __init int cxl_core_init(void) if (rc) goto err_bus; + rc = cxl_region_init(); + if (rc) + goto err_region; + return 0; +err_region: + bus_unregister(&cxl_bus_type); err_bus: destroy_workqueue(cxl_bus_wq); err_wq: @@ -1878,6 +1886,7 @@ static __init int cxl_core_init(void) static void cxl_core_exit(void) { + cxl_region_exit(); bus_unregister(&cxl_bus_type); destroy_workqueue(cxl_bus_wq); cxl_memdev_exit(); diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index b90160c4f975..cd1848d4c8fe 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -1416,7 +1416,7 @@ static void cxl_region_release(struct device *dev) kfree(cxlr); } -static const struct device_type cxl_region_type = { +const struct device_type cxl_region_type = { .name = "cxl_region", .release = cxl_region_release, .groups = region_groups @@ -1614,4 +1614,47 @@ static ssize_t delete_region_store(struct device *dev, } DEVICE_ATTR_WO(delete_region); +static int cxl_region_probe(struct device *dev) +{ + struct cxl_region *cxlr = to_cxl_region(dev); + struct cxl_region_params *p = &cxlr->params; + int rc; + + rc = down_read_interruptible(&cxl_region_rwsem); + if (rc) { + dev_dbg(&cxlr->dev, "probe interrupted\n"); + return rc; + } + + if (p->state < CXL_CONFIG_COMMIT) { + dev_dbg(&cxlr->dev, "config state: %d\n", p->state); + rc = -ENXIO; + } + + /* + * From this point on any path that changes the region's state away from + * CXL_CONFIG_COMMIT is also responsible for releasing the driver. + */ + up_read(&cxl_region_rwsem); + + return rc; +} + +static struct cxl_driver cxl_region_driver = { + .name = "cxl_region", + .probe = cxl_region_probe, + .id = CXL_DEVICE_REGION, +}; + +int cxl_region_init(void) +{ + return cxl_driver_register(&cxl_region_driver); +} + +void cxl_region_exit(void) +{ + cxl_driver_unregister(&cxl_region_driver); +} + MODULE_IMPORT_NS(CXL); +MODULE_ALIAS_CXL(CXL_DEVICE_REGION); diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index fc14f6805f2c..734b4479feb2 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -586,6 +586,7 @@ void cxl_driver_unregister(struct cxl_driver *cxl_drv); #define CXL_DEVICE_PORT 3 #define CXL_DEVICE_ROOT 4 #define CXL_DEVICE_MEMORY_EXPANDER 5 +#define CXL_DEVICE_REGION 6 #define MODULE_ALIAS_CXL(type) MODULE_ALIAS("cxl:t" __stringify(type) "*") #define CXL_MODALIAS_FMT "cxl:t%d" From patchwork Fri Jun 24 04:19:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893666 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9913CCA473 for ; Fri, 24 Jun 2022 04:20:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231363AbiFXEUa (ORCPT ); Fri, 24 Jun 2022 00:20:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231132AbiFXEUS (ORCPT ); Fri, 24 Jun 2022 00:20:18 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB19255367; Thu, 23 Jun 2022 21:20:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044416; x=1687580416; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LEnpiryl3EJtlzLZIRW5oeLAcKcKGsRDBy0eKrTmGME=; b=QQ3krwzAt79Lz7+DeVF5at5p/rua/GtMMQG/b2I1X2/0Rf/sxsbivJIV npICnr3xaYqNX8G+8tcJjmVnnwwfLZv3F+gar6YnKZQYsYWu9kGKK2TWQ pGUaGoWAGmUx/9YIUn/ZL0RmTusXnfTL5YaB0LsXL+KCimzjVoeBX8qPg +bXgc/uxq4Ui1muA4Ss7owxRRte7YGYWULZ2EbLNzj9/LV8ZVNJA0G0ak c5gX671Twc0K6qdgVnbYMAN4CAC32zL9Z4F4FtD6JWQEicdXLpkaAKvx6 hHUv/CzmuSeNzhlhjrIk8ZH9fgjRLOPWQ5YRzYI651dh43RLpCBcOuIxt Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367238058" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367238058" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:16 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092965" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:15 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Dan Williams Subject: [PATCH 44/46] cxl/pmem: Delete unused nvdimm attribute Date: Thu, 23 Jun 2022 21:19:48 -0700 Message-Id: <20220624041950.559155-19-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org While there is a need to go from a LIBNVDIMM 'struct nvdimm' to a CXL 'struct cxl_nvdimm', there is no use case to go the other direction. Likely this is a leftover from an early version of the referenced commit before it implemented devm for releasing the created nvdimm. Fixes: 21083f51521f ("cxl/pmem: Register 'pmem' / cxl_nvdimm devices") Signed-off-by: Dan Williams Reviewed-by: Jonathan Cameron --- drivers/cxl/cxl.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 734b4479feb2..d6ff6337aa49 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -411,7 +411,6 @@ struct cxl_nvdimm_bridge { struct cxl_nvdimm { struct device dev; struct cxl_memdev *cxlmd; - struct nvdimm *nvdimm; }; /** From patchwork Fri Jun 24 04:19:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893667 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 237A5C433EF for ; Fri, 24 Jun 2022 04:20:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231411AbiFXEUe (ORCPT ); Fri, 24 Jun 2022 00:20:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231329AbiFXEUT (ORCPT ); Fri, 24 Jun 2022 00:20:19 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4EF95639B; Thu, 23 Jun 2022 21:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044417; x=1687580417; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gavlelRZmhRVxfC9YWBfVgcdtFPtB4GEpy8NZudDjyI=; b=fgkzINNqIU+/NwWD/MmACtLUEVcDkjzNUie4b5zNQiivJXJeNi5oy7rD ETDd1EvoHhnh6ZG0qqIwm4NC+pjTBlJTd4E9mQQ4STkHbDrkzm23OenxO fQFhmqRbmWvQMphlmOi87yjZpTxYBiMtVtzdLT2keXR9aMa+FCa5Q3f3e DYLK3CalxkOcIm5aEssIlAm5YTaoX9/tsOhu8JSZvKSm6hA6R2oKKL0BQ iScjFA424pGAreB6pTCo2QTxdLMzBrqch/o+BsBLUQ7WqBmdFmqlivgiV NBt+1NSebz6oVxGkWxkwt4wd/9HeSQscnK1IXjhotZXsHMUKL7WvI+FD4 Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367238060" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367238060" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:16 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092968" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:16 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Dan Williams Subject: [PATCH 45/46] cxl/pmem: Fix offline_nvdimm_bus() to offline by bridge Date: Thu, 23 Jun 2022 21:19:49 -0700 Message-Id: <20220624041950.559155-20-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Be careful to only disable cxl_pmem objects related to a given cxl_nvdimm_bridge. Otherwise, offline_nvdimm_bus() reaches across CXL domains and disables more than is expected. Signed-off-by: Dan Williams --- drivers/cxl/cxl.h | 1 + drivers/cxl/pmem.c | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index d6ff6337aa49..95f486bc1b41 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -411,6 +411,7 @@ struct cxl_nvdimm_bridge { struct cxl_nvdimm { struct device dev; struct cxl_memdev *cxlmd; + struct cxl_nvdimm_bridge *bridge; }; /** diff --git a/drivers/cxl/pmem.c b/drivers/cxl/pmem.c index 0aaa70b4e0f7..b271f6e90b91 100644 --- a/drivers/cxl/pmem.c +++ b/drivers/cxl/pmem.c @@ -26,7 +26,10 @@ static void clear_exclusive(void *cxlds) static void unregister_nvdimm(void *nvdimm) { + struct cxl_nvdimm *cxl_nvd = nvdimm_provider_data(nvdimm); + nvdimm_delete(nvdimm); + cxl_nvd->bridge = NULL; } static int cxl_nvdimm_probe(struct device *dev) @@ -66,6 +69,7 @@ static int cxl_nvdimm_probe(struct device *dev) } dev_set_drvdata(dev, nvdimm); + cxl_nvd->bridge = cxl_nvb; rc = devm_add_action_or_reset(dev, unregister_nvdimm, nvdimm); out: device_unlock(&cxl_nvb->dev); @@ -204,15 +208,23 @@ static bool online_nvdimm_bus(struct cxl_nvdimm_bridge *cxl_nvb) return cxl_nvb->nvdimm_bus != NULL; } -static int cxl_nvdimm_release_driver(struct device *dev, void *data) +static int cxl_nvdimm_release_driver(struct device *dev, void *cxl_nvb) { + struct cxl_nvdimm *cxl_nvd; + if (!is_cxl_nvdimm(dev)) return 0; + + cxl_nvd = to_cxl_nvdimm(dev); + if (cxl_nvd->bridge != cxl_nvb) + return 0; + device_release_driver(dev); return 0; } -static void offline_nvdimm_bus(struct nvdimm_bus *nvdimm_bus) +static void offline_nvdimm_bus(struct cxl_nvdimm_bridge *cxl_nvb, + struct nvdimm_bus *nvdimm_bus) { if (!nvdimm_bus) return; @@ -222,7 +234,8 @@ static void offline_nvdimm_bus(struct nvdimm_bus *nvdimm_bus) * nvdimm_bus_unregister() rips the nvdimm objects out from * underneath them. */ - bus_for_each_dev(&cxl_bus_type, NULL, NULL, cxl_nvdimm_release_driver); + bus_for_each_dev(&cxl_bus_type, NULL, cxl_nvb, + cxl_nvdimm_release_driver); nvdimm_bus_unregister(nvdimm_bus); } @@ -260,7 +273,7 @@ static void cxl_nvb_update_state(struct work_struct *work) dev_dbg(&cxl_nvb->dev, "rescan: %d\n", rc); } - offline_nvdimm_bus(victim_bus); + offline_nvdimm_bus(cxl_nvb, victim_bus); put_device(&cxl_nvb->dev); } From patchwork Fri Jun 24 04:19:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 12893668 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77391CCA473 for ; Fri, 24 Jun 2022 04:20:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231470AbiFXEUf (ORCPT ); Fri, 24 Jun 2022 00:20:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229898AbiFXEU2 (ORCPT ); Fri, 24 Jun 2022 00:20:28 -0400 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 293665677B; Thu, 23 Jun 2022 21:20:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656044418; x=1687580418; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wZpcOhWCiYhcxn7Gz6M1glzobiwvNwhKhmWA7RsZ4Ac=; b=fKeJnemaSvcRz1HDSwXyrG+txQyC6tN5T+Bf0JqoCvd6GUXiuuMuIKL0 iRvabCTbkU4EjQb4ZzNAhg3ZR0ilvXZyyIP9bQwY0YQ6Ogkx/WBHj4NYi Melah8raL0G4F2ykjvmKjsh83x3Ls5S77DjjhKt1ashQpHB6foxH/J7sf 9GlsiumuKcS8Rz7ho1hXl9JrxJ5QO9jHvQZW4g8HX3bWii1Dt3le7WEzj Fd1K08ytD7ic/2pNgenErVDDLY2ZeHUAtxm06m6f1Vyg3BIGxOWUaWw6d P/uTgp9g0wKPAjRNxnhvlAcMr1cOteiSewT31YDpUpBfyLsr3j8C6k7Uf w==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367238066" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367238066" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:16 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="645092971" Received: from daharell-mobl2.amr.corp.intel.com (HELO dwillia2-xfh.intel.com) ([10.209.66.176]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 21:20:16 -0700 From: Dan Williams To: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, linux-pci@vger.kernel.org, patches@lists.linux.dev, hch@lst.de, Dan Williams , Ben Widawsky Subject: [PATCH 46/46] cxl/region: Introduce cxl_pmem_region objects Date: Thu, 23 Jun 2022 21:19:50 -0700 Message-Id: <20220624041950.559155-21-dan.j.williams@intel.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> References: <165603869943.551046.3498980330327696732.stgit@dwillia2-xfh> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The LIBNVDIMM subsystem is a platform agnostic representation of system NVDIMM / persistent memory resources. To date, the CXL subsystem's interaction with LIBNVDIMM has been to register an nvdimm-bridge device and cxl_nvdimm objects to proxy CXL capabilities into existing LIBNVDIMM subsystem mechanics. With regions the approach is the same. Create a new cxl_pmem_region object to proxy CXL region details into a LIBNVDIMM definition. With this enabling LIBNVDIMM can partition CXL persistent memory regions with legacy namespace labels. A follow-on patch will add CXL region label and CXL namespace label support to persist region configurations across driver reload / system-reset events. Co-developed-by: Ben Widawsky Signed-off-by: Ben Widawsky Signed-off-by: Dan Williams --- drivers/cxl/core/core.h | 3 + drivers/cxl/core/pmem.c | 4 +- drivers/cxl/core/port.c | 2 + drivers/cxl/core/region.c | 139 ++++++++++++++++++++- drivers/cxl/cxl.h | 36 +++++- drivers/cxl/pmem.c | 235 ++++++++++++++++++++++++++++++++++- drivers/nvdimm/region_devs.c | 28 +++-- include/linux/libnvdimm.h | 5 + 8 files changed, 440 insertions(+), 12 deletions(-) diff --git a/drivers/cxl/core/core.h b/drivers/cxl/core/core.h index be5198ab8f3b..f5c5b041e8a5 100644 --- a/drivers/cxl/core/core.h +++ b/drivers/cxl/core/core.h @@ -13,6 +13,7 @@ extern struct attribute_group cxl_base_attribute_group; extern struct device_attribute dev_attr_create_pmem_region; extern struct device_attribute dev_attr_delete_region; extern struct device_attribute dev_attr_region; +extern const struct device_type cxl_pmem_region_type; extern const struct device_type cxl_region_type; void cxl_decoder_kill_region(struct cxl_endpoint_decoder *cxled); int cxl_region_init(void); @@ -23,6 +24,7 @@ void cxl_region_exit(void); */ #define CXL_REGION_ATTR(x) (&dev_attr_##x.attr) #define CXL_REGION_TYPE(x) (&cxl_region_type) +#define CXL_PMEM_REGION_TYPE(x) (&cxl_pmem_region_type) #else static inline void cxl_decoder_kill_region(struct cxl_endpoint_decoder *cxled) { @@ -36,6 +38,7 @@ static inline void cxl_region_exit(void) } #define CXL_REGION_ATTR(x) NULL #define CXL_REGION_TYPE(x) NULL +#define CXL_PMEM_REGION_TYPE(x) NULL #endif struct cxl_send_command; diff --git a/drivers/cxl/core/pmem.c b/drivers/cxl/core/pmem.c index bec7cfb54ebf..1d12a8206444 100644 --- a/drivers/cxl/core/pmem.c +++ b/drivers/cxl/core/pmem.c @@ -62,9 +62,9 @@ static int match_nvdimm_bridge(struct device *dev, void *data) return is_cxl_nvdimm_bridge(dev); } -struct cxl_nvdimm_bridge *cxl_find_nvdimm_bridge(struct cxl_nvdimm *cxl_nvd) +struct cxl_nvdimm_bridge *cxl_find_nvdimm_bridge(struct device *start) { - struct cxl_port *port = find_cxl_root(&cxl_nvd->dev); + struct cxl_port *port = find_cxl_root(start); struct device *dev; if (!port) diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c index 00add9e0b192..e13cd012ed22 100644 --- a/drivers/cxl/core/port.c +++ b/drivers/cxl/core/port.c @@ -44,6 +44,8 @@ static int cxl_device_id(struct device *dev) return CXL_DEVICE_NVDIMM_BRIDGE; if (dev->type == &cxl_nvdimm_type) return CXL_DEVICE_NVDIMM; + if (dev->type == CXL_PMEM_REGION_TYPE()) + return CXL_DEVICE_PMEM_REGION; if (is_cxl_port(dev)) { if (is_cxl_root(to_cxl_port(dev))) return CXL_DEVICE_ROOT; diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index cd1848d4c8fe..70e9baef95f7 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -1614,6 +1614,136 @@ static ssize_t delete_region_store(struct device *dev, } DEVICE_ATTR_WO(delete_region); +static void cxl_pmem_region_release(struct device *dev) +{ + struct cxl_pmem_region *cxlr_pmem = to_cxl_pmem_region(dev); + int i; + + for (i = 0; i < cxlr_pmem->nr_mappings; i++) { + struct cxl_memdev *cxlmd = cxlr_pmem->mapping[i].cxlmd; + + put_device(&cxlmd->dev); + } + + kfree(cxlr_pmem); +} + +static const struct attribute_group *cxl_pmem_region_attribute_groups[] = { + &cxl_base_attribute_group, + NULL, +}; + +const struct device_type cxl_pmem_region_type = { + .name = "cxl_pmem_region", + .release = cxl_pmem_region_release, + .groups = cxl_pmem_region_attribute_groups, +}; + +bool is_cxl_pmem_region(struct device *dev) +{ + return dev->type == &cxl_pmem_region_type; +} +EXPORT_SYMBOL_NS_GPL(is_cxl_pmem_region, CXL); + +struct cxl_pmem_region *to_cxl_pmem_region(struct device *dev) +{ + if (dev_WARN_ONCE(dev, !is_cxl_pmem_region(dev), + "not a cxl_pmem_region device\n")) + return NULL; + return container_of(dev, struct cxl_pmem_region, dev); +} +EXPORT_SYMBOL_NS_GPL(to_cxl_pmem_region, CXL); + +static struct lock_class_key cxl_pmem_region_key; + +static struct cxl_pmem_region *cxl_pmem_region_alloc(struct cxl_region *cxlr) +{ + struct cxl_pmem_region *cxlr_pmem = ERR_PTR(-ENXIO); + struct cxl_region_params *p = &cxlr->params; + struct device *dev; + int i; + + down_read(&cxl_region_rwsem); + if (p->state != CXL_CONFIG_COMMIT) + goto out; + cxlr_pmem = kzalloc(struct_size(cxlr_pmem, mapping, p->nr_targets), + GFP_KERNEL); + if (!cxlr_pmem) { + cxlr_pmem = ERR_PTR(-ENOMEM); + goto out; + } + + cxlr_pmem->hpa_range.start = p->res->start; + cxlr_pmem->hpa_range.end = p->res->end; + + /* Snapshot the region configuration underneath the cxl_region_rwsem */ + cxlr_pmem->nr_mappings = p->nr_targets; + for (i = 0; i < p->nr_targets; i++) { + struct cxl_endpoint_decoder *cxled = p->targets[i]; + struct cxl_memdev *cxlmd = cxled_to_memdev(cxled); + struct cxl_pmem_region_mapping *m = &cxlr_pmem->mapping[i]; + + m->cxlmd = cxlmd; + get_device(&cxlmd->dev); + m->start = cxled->dpa_res->start; + m->size = resource_size(cxled->dpa_res); + m->position = i; + } + + dev = &cxlr_pmem->dev; + cxlr_pmem->cxlr = cxlr; + device_initialize(dev); + lockdep_set_class(&dev->mutex, &cxl_pmem_region_key); + device_set_pm_not_required(dev); + dev->parent = &cxlr->dev; + dev->bus = &cxl_bus_type; + dev->type = &cxl_pmem_region_type; +out: + up_read(&cxl_region_rwsem); + + return cxlr_pmem; +} + +static void cxlr_pmem_unregister(void *dev) +{ + device_unregister(dev); +} + +/** + * devm_cxl_add_pmem_region() - add a cxl_region to nd_region bridge + * @host: same host as @cxlmd + * + * Return: 0 on success negative error code on failure. + */ +static int devm_cxl_add_pmem_region(struct cxl_region *cxlr) +{ + struct cxl_pmem_region *cxlr_pmem; + struct device *dev; + int rc; + + cxlr_pmem = cxl_pmem_region_alloc(cxlr); + if (IS_ERR(cxlr_pmem)) + return PTR_ERR(cxlr_pmem); + + dev = &cxlr_pmem->dev; + rc = dev_set_name(dev, "pmem_region%d", cxlr->id); + if (rc) + goto err; + + rc = device_add(dev); + if (rc) + goto err; + + dev_dbg(&cxlr->dev, "%s: register %s\n", dev_name(dev->parent), + dev_name(dev)); + + return devm_add_action_or_reset(&cxlr->dev, cxlr_pmem_unregister, dev); + +err: + put_device(dev); + return rc; +} + static int cxl_region_probe(struct device *dev) { struct cxl_region *cxlr = to_cxl_region(dev); @@ -1637,7 +1767,14 @@ static int cxl_region_probe(struct device *dev) */ up_read(&cxl_region_rwsem); - return rc; + switch (cxlr->mode) { + case CXL_DECODER_PMEM: + return devm_cxl_add_pmem_region(cxlr); + default: + dev_dbg(&cxlr->dev, "unsupported region mode: %d\n", + cxlr->mode); + return -ENXIO; + } } static struct cxl_driver cxl_region_driver = { diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 95f486bc1b41..bf878509bed4 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -412,6 +412,25 @@ struct cxl_nvdimm { struct device dev; struct cxl_memdev *cxlmd; struct cxl_nvdimm_bridge *bridge; + struct cxl_pmem_region *region; +}; + +struct cxl_pmem_region_mapping { + struct cxl_memdev *cxlmd; + struct cxl_nvdimm *cxl_nvd; + u64 start; + u64 size; + int position; +}; + +struct cxl_pmem_region { + struct device dev; + struct cxl_region *cxlr; + struct nd_region *nd_region; + struct cxl_nvdimm_bridge *bridge; + struct range hpa_range; + int nr_mappings; + struct cxl_pmem_region_mapping mapping[]; }; /** @@ -587,6 +606,7 @@ void cxl_driver_unregister(struct cxl_driver *cxl_drv); #define CXL_DEVICE_ROOT 4 #define CXL_DEVICE_MEMORY_EXPANDER 5 #define CXL_DEVICE_REGION 6 +#define CXL_DEVICE_PMEM_REGION 7 #define MODULE_ALIAS_CXL(type) MODULE_ALIAS("cxl:t" __stringify(type) "*") #define CXL_MODALIAS_FMT "cxl:t%d" @@ -598,7 +618,21 @@ struct cxl_nvdimm *to_cxl_nvdimm(struct device *dev); bool is_cxl_nvdimm(struct device *dev); bool is_cxl_nvdimm_bridge(struct device *dev); int devm_cxl_add_nvdimm(struct device *host, struct cxl_memdev *cxlmd); -struct cxl_nvdimm_bridge *cxl_find_nvdimm_bridge(struct cxl_nvdimm *cxl_nvd); +struct cxl_nvdimm_bridge *cxl_find_nvdimm_bridge(struct device *dev); + +#ifdef CONFIG_CXL_REGION +bool is_cxl_pmem_region(struct device *dev); +struct cxl_pmem_region *to_cxl_pmem_region(struct device *dev); +#else +static inline bool is_cxl_pmem_region(struct device *dev) +{ + return false; +} +static inline struct cxl_pmem_region *to_cxl_pmem_region(struct device *dev) +{ + return NULL; +} +#endif /* * Unit test builds overrides this to __weak, find the 'strong' version diff --git a/drivers/cxl/pmem.c b/drivers/cxl/pmem.c index b271f6e90b91..4ba7248275ac 100644 --- a/drivers/cxl/pmem.c +++ b/drivers/cxl/pmem.c @@ -7,6 +7,7 @@ #include #include #include +#include #include "cxlmem.h" #include "cxl.h" @@ -27,6 +28,19 @@ static void clear_exclusive(void *cxlds) static void unregister_nvdimm(void *nvdimm) { struct cxl_nvdimm *cxl_nvd = nvdimm_provider_data(nvdimm); + struct cxl_nvdimm_bridge *cxl_nvb = cxl_nvd->bridge; + struct cxl_pmem_region *cxlr_pmem; + + device_lock(&cxl_nvb->dev); + cxlr_pmem = cxl_nvd->region; + dev_set_drvdata(&cxl_nvd->dev, NULL); + cxl_nvd->region = NULL; + device_unlock(&cxl_nvb->dev); + + if (cxlr_pmem) { + device_release_driver(&cxlr_pmem->dev); + put_device(&cxlr_pmem->dev); + } nvdimm_delete(nvdimm); cxl_nvd->bridge = NULL; @@ -42,7 +56,7 @@ static int cxl_nvdimm_probe(struct device *dev) struct nvdimm *nvdimm; int rc; - cxl_nvb = cxl_find_nvdimm_bridge(cxl_nvd); + cxl_nvb = cxl_find_nvdimm_bridge(dev); if (!cxl_nvb) return -ENXIO; @@ -223,6 +237,21 @@ static int cxl_nvdimm_release_driver(struct device *dev, void *cxl_nvb) return 0; } +static int cxl_pmem_region_release_driver(struct device *dev, void *cxl_nvb) +{ + struct cxl_pmem_region *cxlr_pmem; + + if (!is_cxl_pmem_region(dev)) + return 0; + + cxlr_pmem = to_cxl_pmem_region(dev); + if (cxlr_pmem->bridge != cxl_nvb) + return 0; + + device_release_driver(dev); + return 0; +} + static void offline_nvdimm_bus(struct cxl_nvdimm_bridge *cxl_nvb, struct nvdimm_bus *nvdimm_bus) { @@ -234,6 +263,8 @@ static void offline_nvdimm_bus(struct cxl_nvdimm_bridge *cxl_nvb, * nvdimm_bus_unregister() rips the nvdimm objects out from * underneath them. */ + bus_for_each_dev(&cxl_bus_type, NULL, cxl_nvb, + cxl_pmem_region_release_driver); bus_for_each_dev(&cxl_bus_type, NULL, cxl_nvb, cxl_nvdimm_release_driver); nvdimm_bus_unregister(nvdimm_bus); @@ -328,6 +359,200 @@ static struct cxl_driver cxl_nvdimm_bridge_driver = { .id = CXL_DEVICE_NVDIMM_BRIDGE, }; +static int match_cxl_nvdimm(struct device *dev, void *data) +{ + return is_cxl_nvdimm(dev); +} + +static void unregister_region(void *nd_region) +{ + struct cxl_nvdimm_bridge *cxl_nvb; + struct cxl_pmem_region *cxlr_pmem; + int i; + + cxlr_pmem = nd_region_provider_data(nd_region); + cxl_nvb = cxlr_pmem->bridge; + device_lock(&cxl_nvb->dev); + for (i = 0; i < cxlr_pmem->nr_mappings; i++) { + struct cxl_pmem_region_mapping *m = &cxlr_pmem->mapping[i]; + struct cxl_nvdimm *cxl_nvd = m->cxl_nvd; + + if (cxl_nvd->region) { + put_device(&cxlr_pmem->dev); + cxl_nvd->region = NULL; + } + } + device_unlock(&cxl_nvb->dev); + + nvdimm_region_delete(nd_region); +} + +static void cxlr_pmem_remove_resource(void *res) +{ + remove_resource(res); +} + +struct cxl_pmem_region_info { + u64 offset; + u64 serial; +}; + +static int cxl_pmem_region_probe(struct device *dev) +{ + struct nd_mapping_desc mappings[CXL_DECODER_MAX_INTERLEAVE]; + struct cxl_pmem_region *cxlr_pmem = to_cxl_pmem_region(dev); + struct cxl_region *cxlr = cxlr_pmem->cxlr; + struct cxl_pmem_region_info *info = NULL; + struct cxl_nvdimm_bridge *cxl_nvb; + struct nd_interleave_set *nd_set; + struct nd_region_desc ndr_desc; + struct cxl_nvdimm *cxl_nvd; + struct nvdimm *nvdimm; + struct resource *res; + int rc = 0, i; + + cxl_nvb = cxl_find_nvdimm_bridge(&cxlr_pmem->mapping[0].cxlmd->dev); + if (!cxl_nvb) { + dev_dbg(dev, "bridge not found\n"); + return -ENXIO; + } + cxlr_pmem->bridge = cxl_nvb; + + device_lock(&cxl_nvb->dev); + if (!cxl_nvb->nvdimm_bus) { + dev_dbg(dev, "nvdimm bus not found\n"); + rc = -ENXIO; + goto out; + } + + memset(&mappings, 0, sizeof(mappings)); + memset(&ndr_desc, 0, sizeof(ndr_desc)); + + res = devm_kzalloc(dev, sizeof(*res), GFP_KERNEL); + if (!res) { + rc = -ENOMEM; + goto out; + } + + res->name = "Persistent Memory"; + res->start = cxlr_pmem->hpa_range.start; + res->end = cxlr_pmem->hpa_range.end; + res->flags = IORESOURCE_MEM; + res->desc = IORES_DESC_PERSISTENT_MEMORY; + + rc = insert_resource(&iomem_resource, res); + if (rc) + goto out; + + rc = devm_add_action_or_reset(dev, cxlr_pmem_remove_resource, res); + if (rc) + goto out; + + ndr_desc.res = res; + ndr_desc.provider_data = cxlr_pmem; + + ndr_desc.numa_node = memory_add_physaddr_to_nid(res->start); + ndr_desc.target_node = phys_to_target_node(res->start); + if (ndr_desc.target_node == NUMA_NO_NODE) { + ndr_desc.target_node = ndr_desc.numa_node; + dev_dbg(&cxlr->dev, "changing target node from %d to %d", + NUMA_NO_NODE, ndr_desc.target_node); + } + + nd_set = devm_kzalloc(dev, sizeof(*nd_set), GFP_KERNEL); + if (!nd_set) { + rc = -ENOMEM; + goto out; + } + + ndr_desc.memregion = cxlr->id; + set_bit(ND_REGION_CXL, &ndr_desc.flags); + set_bit(ND_REGION_PERSIST_MEMCTRL, &ndr_desc.flags); + + info = kmalloc_array(cxlr_pmem->nr_mappings, sizeof(*info), GFP_KERNEL); + if (!info) + goto out; + + rc = -ENODEV; + for (i = 0; i < cxlr_pmem->nr_mappings; i++) { + struct cxl_pmem_region_mapping *m = &cxlr_pmem->mapping[i]; + struct cxl_memdev *cxlmd = m->cxlmd; + struct cxl_dev_state *cxlds = cxlmd->cxlds; + struct device *d; + + d = device_find_child(&cxlmd->dev, NULL, match_cxl_nvdimm); + if (!d) { + dev_dbg(dev, "[%d]: %s: no cxl_nvdimm found\n", i, + dev_name(&cxlmd->dev)); + goto err; + } + + /* safe to drop ref now with bridge lock held */ + put_device(d); + + cxl_nvd = to_cxl_nvdimm(d); + nvdimm = dev_get_drvdata(&cxl_nvd->dev); + if (!nvdimm) { + dev_dbg(dev, "[%d]: %s: no nvdimm found\n", i, + dev_name(&cxlmd->dev)); + goto err; + } + cxl_nvd->region = cxlr_pmem; + get_device(&cxlr_pmem->dev); + m->cxl_nvd = cxl_nvd; + mappings[i] = (struct nd_mapping_desc) { + .nvdimm = nvdimm, + .start = m->start, + .size = m->size, + .position = i, + }; + info[i].offset = m->start; + info[i].serial = cxlds->serial; + } + ndr_desc.num_mappings = cxlr_pmem->nr_mappings; + ndr_desc.mapping = mappings; + + /* + * TODO enable CXL labels which skip the need for 'interleave-set cookie' + */ + nd_set->cookie1 = + nd_fletcher64(info, sizeof(*info) * cxlr_pmem->nr_mappings, 0); + nd_set->cookie2 = nd_set->cookie1; + ndr_desc.nd_set = nd_set; + + cxlr_pmem->nd_region = + nvdimm_pmem_region_create(cxl_nvb->nvdimm_bus, &ndr_desc); + if (IS_ERR(cxlr_pmem->nd_region)) { + rc = PTR_ERR(cxlr_pmem->nd_region); + goto err; + } else + rc = devm_add_action_or_reset(dev, unregister_region, + cxlr_pmem->nd_region); +out: + device_unlock(&cxl_nvb->dev); + put_device(&cxl_nvb->dev); + kfree(info); + + if (rc) + dev_dbg(dev, "failed to create nvdimm region\n"); + return rc; + +err: + for (i--; i >= 0; i--) { + nvdimm = mappings[i].nvdimm; + cxl_nvd = nvdimm_provider_data(nvdimm); + put_device(&cxl_nvd->region->dev); + cxl_nvd->region = NULL; + } + goto out; +} + +static struct cxl_driver cxl_pmem_region_driver = { + .name = "cxl_pmem_region", + .probe = cxl_pmem_region_probe, + .id = CXL_DEVICE_PMEM_REGION, +}; + /* * Return all bridges to the CXL_NVB_NEW state to invalidate any * ->state_work referring to the now destroyed cxl_pmem_wq. @@ -372,8 +597,14 @@ static __init int cxl_pmem_init(void) if (rc) goto err_nvdimm; + rc = cxl_driver_register(&cxl_pmem_region_driver); + if (rc) + goto err_region; + return 0; +err_region: + cxl_driver_unregister(&cxl_nvdimm_driver); err_nvdimm: cxl_driver_unregister(&cxl_nvdimm_bridge_driver); err_bridge: @@ -383,6 +614,7 @@ static __init int cxl_pmem_init(void) static __exit void cxl_pmem_exit(void) { + cxl_driver_unregister(&cxl_pmem_region_driver); cxl_driver_unregister(&cxl_nvdimm_driver); cxl_driver_unregister(&cxl_nvdimm_bridge_driver); destroy_cxl_pmem_wq(); @@ -394,3 +626,4 @@ module_exit(cxl_pmem_exit); MODULE_IMPORT_NS(CXL); MODULE_ALIAS_CXL(CXL_DEVICE_NVDIMM_BRIDGE); MODULE_ALIAS_CXL(CXL_DEVICE_NVDIMM); +MODULE_ALIAS_CXL(CXL_DEVICE_PMEM_REGION); diff --git a/drivers/nvdimm/region_devs.c b/drivers/nvdimm/region_devs.c index d976260eca7a..473a71bbd9c9 100644 --- a/drivers/nvdimm/region_devs.c +++ b/drivers/nvdimm/region_devs.c @@ -133,7 +133,8 @@ static void nd_region_release(struct device *dev) put_device(&nvdimm->dev); } free_percpu(nd_region->lane); - memregion_free(nd_region->id); + if (!test_bit(ND_REGION_CXL, &nd_region->flags)) + memregion_free(nd_region->id); kfree(nd_region); } @@ -982,9 +983,14 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus, if (!nd_region) return NULL; - nd_region->id = memregion_alloc(GFP_KERNEL); - if (nd_region->id < 0) - goto err_id; + /* CXL pre-assigns memregion ids before creating nvdimm regions */ + if (test_bit(ND_REGION_CXL, &ndr_desc->flags)) { + nd_region->id = ndr_desc->memregion; + } else { + nd_region->id = memregion_alloc(GFP_KERNEL); + if (nd_region->id < 0) + goto err_id; + } nd_region->lane = alloc_percpu(struct nd_percpu_lane); if (!nd_region->lane) @@ -1043,9 +1049,10 @@ static struct nd_region *nd_region_create(struct nvdimm_bus *nvdimm_bus, return nd_region; - err_percpu: - memregion_free(nd_region->id); - err_id: +err_percpu: + if (!test_bit(ND_REGION_CXL, &ndr_desc->flags)) + memregion_free(nd_region->id); +err_id: kfree(nd_region); return NULL; } @@ -1068,6 +1075,13 @@ struct nd_region *nvdimm_volatile_region_create(struct nvdimm_bus *nvdimm_bus, } EXPORT_SYMBOL_GPL(nvdimm_volatile_region_create); +void nvdimm_region_delete(struct nd_region *nd_region) +{ + if (nd_region) + nd_device_unregister(&nd_region->dev, ND_SYNC); +} +EXPORT_SYMBOL_GPL(nvdimm_region_delete); + int nvdimm_flush(struct nd_region *nd_region, struct bio *bio) { int rc = 0; diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h index 0d61e07b6827..c74acfa1a3fe 100644 --- a/include/linux/libnvdimm.h +++ b/include/linux/libnvdimm.h @@ -59,6 +59,9 @@ enum { /* Platform provides asynchronous flush mechanism */ ND_REGION_ASYNC = 3, + /* Region was created by CXL subsystem */ + ND_REGION_CXL = 4, + /* mark newly adjusted resources as requiring a label update */ DPA_RESOURCE_ADJUSTED = 1 << 0, }; @@ -122,6 +125,7 @@ struct nd_region_desc { int numa_node; int target_node; unsigned long flags; + int memregion; struct device_node *of_node; int (*flush)(struct nd_region *nd_region, struct bio *bio); }; @@ -259,6 +263,7 @@ static inline struct nvdimm *nvdimm_create(struct nvdimm_bus *nvdimm_bus, cmd_mask, num_flush, flush_wpq, NULL, NULL, NULL); } void nvdimm_delete(struct nvdimm *nvdimm); +void nvdimm_region_delete(struct nd_region *nd_region); const struct nd_cmd_desc *nd_cmd_dimm_desc(int cmd); const struct nd_cmd_desc *nd_cmd_bus_desc(int cmd);