Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp1765053pxy; Thu, 6 May 2021 15:38:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFYtgo4uO1/7eFMOzORSvttxss6B0WpBWv1PkEAcdVDwoWjYZfM8HpWdEBb3uq1NLKWJYr X-Received: by 2002:aa7:d658:: with SMTP id v24mr7666800edr.290.1620340726571; Thu, 06 May 2021 15:38:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620340726; cv=none; d=google.com; s=arc-20160816; b=UplO0oH7aFfT4Wz0Rc2W5H3JbmMl3ArShrCINHNqxN8xAn6EYgEEG22GxUYI0UxyPk o0CcXM+kxOy7zT1YsC+dm5vMuR3adwH9rW93UWq1RYi1BslNkU9kRs7Ck8cNZP5j/Vtw ItO85FMznNVqQ+1unEzt1gTHGlpZWMb0uGRBKmyzbQbwNHSWCdaYhdcP1W3+s1y7io3A T5i/0pkWKYiwqkYA4d64WtSFGsAiJ3hjoub4yjq63fnD11uJm69rEhwVwnl77RfNRhmi NplcqnkbWdbaU4SR+VIzwonyq17D429yTpWbdjQe6NTHxc4WDwoLzqz7voOSd8A+SJki jxqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=MFUvjDAanlqX6JgvcFBrWJ/SfjhCzB6jyCNQT54o7+Q=; b=BQrsaQmD2yl1lldcv2ArnKVlDCWac1f+c7JdjuW8vub5lQt4innYd+4nMX1DS7QIlp Eq5P6eZFV7CzlIvsl6l8DfcRuu9G3H9OUsELroVvh9fzRpMXTvGVsalU3cpFxIn/+xj0 Oy9qiEmFx1moCsLJd0l1lPe20tcOUtj3ngaByY4c7kjrODJdMRK6pPBBS4kEU5wQOJNT M7lqvimwBiN9dR53OObahI2L8E0xBP49RrzmeUBJxHAGYvksRSGjITa3Kqo/NxiHlXJt /TRwI2edRLRqPB3GVfN6SZYNwcFk5nGN5HphdV0xbAtvLvGiw8NT3TP9NgLKL1sIxJZx NiFA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f24si3267494eds.10.2021.05.06.15.38.21; Thu, 06 May 2021 15:38:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231299AbhEFWiS (ORCPT + 99 others); Thu, 6 May 2021 18:38:18 -0400 Received: from mga02.intel.com ([134.134.136.20]:7715 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231159AbhEFWiK (ORCPT ); Thu, 6 May 2021 18:38:10 -0400 IronPort-SDR: I1LhFAC+k5WsX5HVAxonjIz+MyIzNFquyTOWXeDLO2sVOaGTPK5Z8i8eVPevqjQCH8EytoR4DM kvP5DRwb24ow== X-IronPort-AV: E=McAfee;i="6200,9189,9976"; a="185726267" X-IronPort-AV: E=Sophos;i="5.82,279,1613462400"; d="scan'208";a="185726267" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 May 2021 15:37:10 -0700 IronPort-SDR: lrsSp+RXpFD1W1E/w335wMHAvegV0TxG/bPWkiDEuBGClcfSRuPwTUI/ZzjmqXVtgLwEnaO7lC 5hDoCvLaAP1w== X-IronPort-AV: E=Sophos;i="5.82,279,1613462400"; d="scan'208";a="622630595" Received: from iweiny-desk2.sc.intel.com (HELO localhost) ([10.3.52.147]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 May 2021 15:37:10 -0700 From: ira.weiny@intel.com To: Ben Widawsky , Dan Williams Cc: Ira Weiny , Alison Schofield , Vishal Verma , Jonathan Cameron , linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] cxl/mem: Fully decode device capability header Date: Thu, 6 May 2021 15:36:51 -0700 Message-Id: <20210506223654.1310516-2-ira.weiny@intel.com> X-Mailer: git-send-email 2.28.0.rc0.12.gb6a658bd00c9 In-Reply-To: <20210506223654.1310516-1-ira.weiny@intel.com> References: <20210506223654.1310516-1-ira.weiny@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ira Weiny Previously only the capability ID and offset were decoded. Create a version MASK and decode the additional version and length fields of the header. Signed-off-by: Ira Weiny --- drivers/cxl/core.c | 15 ++++++++++++--- drivers/cxl/cxl.h | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/cxl/core.c b/drivers/cxl/core.c index b3c3532b53f7..21553386e218 100644 --- a/drivers/cxl/core.c +++ b/drivers/cxl/core.c @@ -501,12 +501,21 @@ void cxl_setup_device_regs(struct device *dev, void __iomem *base, for (cap = 1; cap <= cap_count; cap++) { void __iomem *register_block; - u32 offset; + u32 hdr, offset, __maybe_unused length; u16 cap_id; + u8 version; + + hdr = readl(base + cap * 0x10); + + cap_id = FIELD_GET(CXLDEV_CAP_HDR_CAP_ID_MASK, hdr); + version = FIELD_GET(CXLDEV_CAP_HDR_VERSION_MASK, hdr); + if (version != 1) + dev_err(dev, "Vendor cap ID: %x incorrect version (0x%x)\n", + cap_id, version); - cap_id = FIELD_GET(CXLDEV_CAP_HDR_CAP_ID_MASK, - readl(base + cap * 0x10)); offset = readl(base + cap * 0x10 + 0x4); + length = readl(base + cap * 0x10 + 0x8); + register_block = base + offset; switch (cap_id) { diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 0211f44c95a2..9b315c069557 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -15,6 +15,7 @@ #define CXLDEV_CAP_ARRAY_COUNT_MASK GENMASK_ULL(47, 32) /* CXL 2.0 8.2.8.2 CXL Device Capability Header Register */ #define CXLDEV_CAP_HDR_CAP_ID_MASK GENMASK(15, 0) +#define CXLDEV_CAP_HDR_VERSION_MASK GENMASK(23, 16) /* CXL 2.0 8.2.8.2.1 CXL Device Capabilities */ #define CXLDEV_CAP_CAP_ID_DEVICE_STATUS 0x1 #define CXLDEV_CAP_CAP_ID_PRIMARY_MAILBOX 0x2 -- 2.28.0.rc0.12.gb6a658bd00c9