Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752834AbcLLOZj convert rfc822-to-8bit (ORCPT ); Mon, 12 Dec 2016 09:25:39 -0500 Received: from mga05.intel.com ([192.55.52.43]:24219 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752009AbcLLOZh (ORCPT ); Mon, 12 Dec 2016 09:25:37 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,336,1477983600"; d="scan'208";a="797073198" From: "Winkler, Tomas" To: Jarkko Sakkinen , Peter Huewe CC: open list , "linux-security-module@vger.kernel.org" , "moderated list:TPM DEVICE DRIVER" Subject: RE: [tpmdd-devel] [PATCH v3 1/3] tpm_crb: map locality registers Thread-Topic: [tpmdd-devel] [PATCH v3 1/3] tpm_crb: map locality registers Thread-Index: AQHSUIAvAYiuaEwWlkaaNtaLKaA5nqEEYvjA Date: Mon, 12 Dec 2016 14:25:32 +0000 Message-ID: <5B8DA87D05A7694D9FA63FD143655C1B5433A4BD@hasmsx108.ger.corp.intel.com> References: <20161207115001.18332-1-jarkko.sakkinen@linux.intel.com> <20161207115001.18332-2-jarkko.sakkinen@linux.intel.com> In-Reply-To: <20161207115001.18332-2-jarkko.sakkinen@linux.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_IC x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZWVkZGZjYzAtNWUyZS00NGU3LTlmOWMtYmYxNmEzNjdlN2NhIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6ImltWjF1YXBNOTNJQUEyUGN0OUh2WkJxYXBFU3dmN0I4d1lQanB2d1cwUzA9In0= x-originating-ip: [10.184.70.10] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7399 Lines: 226 > > In order to provide access to locality registers, this commits adds mapping of > the head of the CRB registers, which are located right before the control area. > > Signed-off-by: Jarkko Sakkinen > --- > drivers/char/tpm/tpm_crb.c | 89 +++++++++++++++++++++++++++++------------ > ----- > 1 file changed, 57 insertions(+), 32 deletions(-) > > diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index > 717b6b4..80b9759 100644 > --- a/drivers/char/tpm/tpm_crb.c > +++ b/drivers/char/tpm/tpm_crb.c > @@ -52,18 +52,28 @@ enum crb_cancel { > CRB_CANCEL_INVOKE = BIT(0), > }; > > -struct crb_control_area { > - u32 req; > - u32 sts; > - u32 cancel; > - u32 start; > - u32 int_enable; > - u32 int_sts; > - u32 cmd_size; > - u32 cmd_pa_low; > - u32 cmd_pa_high; > - u32 rsp_size; > - u64 rsp_pa; > +struct crb_regs_head { > + u32 loc_state; > + u32 reserved1; > + u32 loc_ctrl; > + u32 loc_sts; > + u8 reserved2[32]; > + u64 intf_id; > + u64 ctrl_ext; > +} __packed; > + > +struct crb_regs_tail { Why to change the name this is still control_area > + u32 ctrl_req; > + u32 ctrl_sts; > + u32 ctrl_cancel; > + u32 ctrl_start; > + u32 ctrl_int_enable; > + u32 ctrl_int_sts; > + u32 ctrl_cmd_size; > + u32 ctrl_cmd_pa_low; > + u32 ctrl_cmd_pa_high; > + u32 ctrl_rsp_size; > + u64 ctrl_rsp_pa; > } __packed; > > enum crb_status { > @@ -78,7 +88,8 @@ enum crb_flags { > struct crb_priv { > unsigned int flags; > void __iomem *iobase; > - struct crb_control_area __iomem *cca; > + struct crb_regs_head __iomem *regs_h; > + struct crb_regs_tail __iomem *regs_t; Same here, why to change the name, let's keep it cca it will reduce the size of patch and make it more back portable. > u8 __iomem *cmd; > u8 __iomem *rsp; > u32 cmd_size; > @@ -104,7 +115,7 @@ static int __maybe_unused crb_go_idle(struct device > *dev, struct crb_priv *priv) > if (priv->flags & CRB_FL_ACPI_START) > return 0; > > - iowrite32(CRB_CTRL_REQ_GO_IDLE, &priv->cca->req); > + iowrite32(CRB_CTRL_REQ_GO_IDLE, &priv->regs_t->ctrl_req); > /* we don't really care when this settles */ > > return 0; > @@ -128,21 +139,23 @@ static int __maybe_unused crb_cmd_ready(struct > device *dev, > struct crb_priv *priv) > { > ktime_t stop, start; > + u32 req; > > if (priv->flags & CRB_FL_ACPI_START) > return 0; > > - iowrite32(CRB_CTRL_REQ_CMD_READY, &priv->cca->req); > + iowrite32(CRB_CTRL_REQ_CMD_READY, &priv->regs_t->ctrl_req); > > start = ktime_get(); > stop = ktime_add(start, ms_to_ktime(TPM2_TIMEOUT_C)); > do { > - if (!(ioread32(&priv->cca->req) & > CRB_CTRL_REQ_CMD_READY)) > + req = ioread32(&priv->regs_t->ctrl_req); > + if (!(req & CRB_CTRL_REQ_CMD_READY)) > return 0; > usleep_range(50, 100); > } while (ktime_before(ktime_get(), stop)); > > - if (ioread32(&priv->cca->req) & CRB_CTRL_REQ_CMD_READY) { > + if (ioread32(&priv->regs_t->ctrl_req) & CRB_CTRL_REQ_CMD_READY) > { > dev_warn(dev, "cmdReady timed out\n"); > return -ETIME; > } > @@ -155,7 +168,7 @@ static u8 crb_status(struct tpm_chip *chip) > struct crb_priv *priv = dev_get_drvdata(&chip->dev); > u8 sts = 0; > > - if ((ioread32(&priv->cca->start) & CRB_START_INVOKE) != > + if ((ioread32(&priv->regs_t->ctrl_start) & CRB_START_INVOKE) != > CRB_START_INVOKE) > sts |= CRB_DRV_STS_COMPLETE; > > @@ -171,7 +184,7 @@ static int crb_recv(struct tpm_chip *chip, u8 *buf, > size_t count) > if (count < 6) > return -EIO; > > - if (ioread32(&priv->cca->sts) & CRB_CTRL_STS_ERROR) > + if (ioread32(&priv->regs_t->ctrl_sts) & CRB_CTRL_STS_ERROR) > return -EIO; > > memcpy_fromio(buf, priv->rsp, 6); > @@ -210,7 +223,7 @@ static int crb_send(struct tpm_chip *chip, u8 *buf, > size_t len) > /* Zero the cancel register so that the next command will not get > * canceled. > */ > - iowrite32(0, &priv->cca->cancel); > + iowrite32(0, &priv->regs_t->ctrl_cancel); > > if (len > priv->cmd_size) { > dev_err(&chip->dev, "invalid command count value %zd %d\n", > @@ -224,7 +237,7 @@ static int crb_send(struct tpm_chip *chip, u8 *buf, > size_t len) > wmb(); > > if (priv->flags & CRB_FL_CRB_START) > - iowrite32(CRB_START_INVOKE, &priv->cca->start); > + iowrite32(CRB_START_INVOKE, &priv->regs_t->ctrl_start); > > if (priv->flags & CRB_FL_ACPI_START) > rc = crb_do_acpi_start(chip); > @@ -236,7 +249,7 @@ static void crb_cancel(struct tpm_chip *chip) { > struct crb_priv *priv = dev_get_drvdata(&chip->dev); > > - iowrite32(CRB_CANCEL_INVOKE, &priv->cca->cancel); > + iowrite32(CRB_CANCEL_INVOKE, &priv->regs_t->ctrl_cancel); > > if ((priv->flags & CRB_FL_ACPI_START) && crb_do_acpi_start(chip)) > dev_err(&chip->dev, "ACPI Start failed\n"); @@ -245,7 +258,7 > @@ static void crb_cancel(struct tpm_chip *chip) static bool > crb_req_canceled(struct tpm_chip *chip, u8 status) { > struct crb_priv *priv = dev_get_drvdata(&chip->dev); > - u32 cancel = ioread32(&priv->cca->cancel); > + u32 cancel = ioread32(&priv->regs_t->ctrl_cancel); > > return (cancel & CRB_CANCEL_INVOKE) == CRB_CANCEL_INVOKE; } > @@ -322,10 +335,22 @@ static int crb_map_io(struct acpi_device *device, > struct crb_priv *priv, > if (IS_ERR(priv->iobase)) > return PTR_ERR(priv->iobase); > > - priv->cca = crb_map_res(dev, priv, &io_res, buf->control_address, > - sizeof(struct crb_control_area)); > - if (IS_ERR(priv->cca)) > - return PTR_ERR(priv->cca); > + /* The ACPI IO region starts at the head area and continues to include > + * the control area, as one nice sane region except for some older > + * stuff that puts the control area outside the ACPI IO region. This is not explained correctly. BDW and older platforms implement only a PC subset of the spec. On those platforms there are only CCA registers, other registers are not implemented. > + */ > + if (!(priv->flags & CRB_FL_ACPI_START)) { > + if (buf->control_address == io_res.start + > + sizeof(*priv->regs_h)) > + priv->regs_h = priv->iobase; > + else > + dev_warn(dev, FW_BUG "Bad ACPI memory layout"); > + } > + > + priv->regs_t = crb_map_res(dev, priv, &io_res, buf->control_address, > + sizeof(struct crb_regs_tail)); > + if (IS_ERR(priv->regs_t)) > + return PTR_ERR(priv->regs_t); > > /* > * PTT HW bug w/a: wake up the device to access @@ -335,10 +360,10 > @@ static int crb_map_io(struct acpi_device *device, struct crb_priv *priv, > if (ret) > return ret; > > - pa_high = ioread32(&priv->cca->cmd_pa_high); > - pa_low = ioread32(&priv->cca->cmd_pa_low); > + pa_high = ioread32(&priv->regs_t->ctrl_cmd_pa_high); > + pa_low = ioread32(&priv->regs_t->ctrl_cmd_pa_low); > cmd_pa = ((u64)pa_high << 32) | pa_low; > - cmd_size = ioread32(&priv->cca->cmd_size); > + cmd_size = ioread32(&priv->regs_t->ctrl_cmd_size); > > dev_dbg(dev, "cmd_hi = %X cmd_low = %X cmd_size %X\n", > pa_high, pa_low, cmd_size); > @@ -349,9 +374,9 @@ static int crb_map_io(struct acpi_device *device, struct > crb_priv *priv, > goto out; > } > > - memcpy_fromio(&rsp_pa, &priv->cca->rsp_pa, 8); > + memcpy_fromio(&rsp_pa, &priv->regs_t->ctrl_rsp_pa, 8); > rsp_pa = le64_to_cpu(rsp_pa); > - rsp_size = ioread32(&priv->cca->rsp_size); > + rsp_size = ioread32(&priv->regs_t->ctrl_rsp_size); > > if (cmd_pa != rsp_pa) { > priv->rsp = crb_map_res(dev, priv, &io_res, rsp_pa, rsp_size); > -- > 2.9.3