Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp1692218pxk; Fri, 4 Sep 2020 16:56:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZyqHjXDbzLe77o0a51dx1Cw7hI3Y2rnsIhxO0cToFQQKTo4z1nJouY7E2+TyfPCtY5psZ X-Received: by 2002:aa7:cf93:: with SMTP id z19mr11609993edx.187.1599263803183; Fri, 04 Sep 2020 16:56:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599263803; cv=none; d=google.com; s=arc-20160816; b=gI2aOK7Lbf5UQ2qgpZVbfOfOkWWBTvDnTdJ42XfzJ+ZyrQhC1N90a9+9xiNFmJnEtN FcqicyJrZ0zDxHacGWceDdJVtYdU7Ov7y9ypHu3a/qNe4DwHho34rIbF37grdm2E94Dq yLY4Cx9OgY+piiUoXJiXzptSGeocYJ23418yCZSEuZGEGcp/RVScEmXs03mCb4ijqJnS UYqayOFkICGXB4ATcrR48actu0UynUAs61/FuAL3Y1DzK+KDLjKdWhyISMHJ+vAPTCfT ihujUTImAZSqCq8F9utlLPi+fA8QLEUZkz96df7t5VGaoiK8tx0FCK4zLwKG7kA7if5a zNpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:ironport-sdr:ironport-sdr; bh=cNJGIHjPRFx1zQLPSiAps3rAHyUPd/nN9nBQXFYi8jw=; b=eKd2ilNZ+/2tIH6f2wH6J/SYdHgCE3NNH/VwNfTeA75PK5fvJvLeFim52FVcvuSFFH VgaLd4ESuvMimGdDXTTfKflv/+B+rcVnLNcMWhFAl160N/z1CoqjCShzq+uJ6FTYCU/i iNzP/rHPXt9bOkFoznsED5THocpof/Abpsc5ugL6fdC3+sbBQ+BizdxMuepSI5iysoUV RLQucKtMk15fF3C496wbzWJUGxsec46lQz6bsARMR+pQ0nrMRXBA6w/uU3Zmfqrzdnm9 Gzi4DH13yePqd924b6X0VnyN8wLPKqXqOqA8AOj+HVMwsJbB7y5CSuAeP8zBo2v++CZH U6+Q== 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 v23si1686646edr.208.2020.09.04.16.56.20; Fri, 04 Sep 2020 16:56:43 -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 S1728379AbgIDXyG (ORCPT + 99 others); Fri, 4 Sep 2020 19:54:06 -0400 Received: from mga06.intel.com ([134.134.136.31]:64696 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726277AbgIDXxT (ORCPT ); Fri, 4 Sep 2020 19:53:19 -0400 IronPort-SDR: KVRTl1KTa+AfHSdVnyDc+TY5rlGqVncyNBjqW4ptBCJgqmpIDP3/5f1DmyCK8MMlZC0LDQROK4 G+xmUPNPoV5A== X-IronPort-AV: E=McAfee;i="6000,8403,9734"; a="219386192" X-IronPort-AV: E=Sophos;i="5.76,391,1592895600"; d="scan'208";a="219386192" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Sep 2020 16:53:16 -0700 IronPort-SDR: YLqLc/x7mHM0QumtFzNG/L8YGrZeq3wayJFuQry1c5Y+sZ2K2flDetyBWcgOmFOE4bkfpM14Db +D0QjgpS89HA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,391,1592895600"; d="scan'208";a="284656215" Received: from rhweight-mobl2.amr.corp.intel.com (HELO rhweight-mobl2.ra.intel.com) ([10.251.151.80]) by fmsmga008.fm.intel.com with ESMTP; 04 Sep 2020 16:53:15 -0700 From: Russ Weight To: mdf@kernel.org, lee.jones@linaro.org, linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org Cc: trix@redhat.com, lgoncalv@redhat.com, yilun.xu@intel.com, hao.wu@intel.com, matthew.gerlach@intel.com, Russ Weight Subject: [PATCH v1 04/12] fpga: expose max10 canceled keys in sysfs Date: Fri, 4 Sep 2020 16:52:57 -0700 Message-Id: <20200904235305.6254-5-russell.h.weight@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200904235305.6254-1-russell.h.weight@intel.com> References: <20200904235305.6254-1-russell.h.weight@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Extend the MAX10 BMC Security Engine driver to provide a handler to expose the canceled code signing key (CSK) bit vectors. These use the standard bitmap list format (e.g. 1,2-6,9). Signed-off-by: Russ Weight Reviewed-by: Wu Hao --- drivers/fpga/intel-m10-bmc-secure.c | 60 +++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/drivers/fpga/intel-m10-bmc-secure.c b/drivers/fpga/intel-m10-bmc-secure.c index b824790e43aa..46cd49a08be0 100644 --- a/drivers/fpga/intel-m10-bmc-secure.c +++ b/drivers/fpga/intel-m10-bmc-secure.c @@ -130,14 +130,74 @@ static int get_qspi_flash_count(struct ifpga_sec_mgr *imgr) return ret ? : cnt; } +#define CSK_BIT_LEN 128U +#define CSK_32ARRAY_SIZE(_nbits) DIV_ROUND_UP(_nbits, 32) + +#define SYSFS_GET_CSK_CANCEL_NBITS(_name) \ +static int get_##_name##_csk_cancel_nbits(struct ifpga_sec_mgr *imgr) \ +{ \ + return (int)CSK_BIT_LEN; \ +} + +SYSFS_GET_CSK_CANCEL_NBITS(bmc) +SYSFS_GET_CSK_CANCEL_NBITS(sr) +SYSFS_GET_CSK_CANCEL_NBITS(pr) + +static int get_csk_vector(struct ifpga_sec_mgr *imgr, u32 addr, + unsigned long *csk_map, unsigned int nbits) +{ + unsigned int i, arr_size = CSK_32ARRAY_SIZE(nbits); + struct m10bmc_sec *sec = imgr->priv; + u32 *csk32; + int ret; + + csk32 = vmalloc(arr_size); + if (!csk32) + return -ENOMEM; + + ret = m10bmc_raw_bulk_read(sec->m10bmc, addr, csk32, arr_size); + if (ret) { + dev_err(sec->dev, "%s failed to read %d\n", __func__, ret); + goto vfree_exit; + } + + for (i = 0; i < arr_size; i++) + csk32[i] = le32_to_cpu(csk32[i]); + + bitmap_from_arr32(csk_map, csk32, nbits); + bitmap_complement(csk_map, csk_map, nbits); + +vfree_exit: + vfree(csk32); + return ret; +} + +#define SYSFS_GET_CSK_VEC(_name, _addr) \ +static int get_##_name##_canceled_csks(struct ifpga_sec_mgr *imgr, \ + unsigned long *csk_map, \ + unsigned int nbits) \ +{ return get_csk_vector(imgr, _addr, csk_map, nbits); } + +#define CSK_VEC_OFFSET 0x34 + +SYSFS_GET_CSK_VEC(bmc, BMC_PROG_ADDR + CSK_VEC_OFFSET) +SYSFS_GET_CSK_VEC(sr, SR_PROG_ADDR + CSK_VEC_OFFSET) +SYSFS_GET_CSK_VEC(pr, PR_PROG_ADDR + CSK_VEC_OFFSET) + static const struct ifpga_sec_mgr_ops m10bmc_iops = { .user_flash_count = get_qspi_flash_count, .bmc_root_entry_hash = get_bmc_root_entry_hash, .sr_root_entry_hash = get_sr_root_entry_hash, .pr_root_entry_hash = get_pr_root_entry_hash, + .bmc_canceled_csks = get_bmc_canceled_csks, + .sr_canceled_csks = get_sr_canceled_csks, + .pr_canceled_csks = get_pr_canceled_csks, .bmc_reh_size = get_bmc_reh_size, .sr_reh_size = get_sr_reh_size, .pr_reh_size = get_pr_reh_size, + .bmc_canceled_csk_nbits = get_bmc_csk_cancel_nbits, + .sr_canceled_csk_nbits = get_sr_csk_cancel_nbits, + .pr_canceled_csk_nbits = get_pr_csk_cancel_nbits }; static void ifpga_sec_mgr_uinit(struct m10bmc_sec *sec) -- 2.17.1