| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <a3cbd452f9a1eef1983e6f47efddcb89@mail.gmail.com>
Date: Wed, 19 Jul 2017 10:04:50 +0530
From: Raveendra Padasalagi <raveendra.padasalagi@...adcom.com>
To: Herbert Xu <herbert@...dor.apana.org.au>,
"David S. Miller" <davem@...emloft.net>,
Rob Rice <rob.rice@...adcom.com>,
Scott Branden <sbranden@...adcom.com>,
linux-crypto@...r.kernel.org
Cc: Ray Jui <ray.jui@...adcom.com>,
Steven Lin <steven.lin1@...adcom.com>,
bcm-kernel-feedback-list@...adcom.com,
linux-kernel@...r.kernel.org, stable@...r.kernel.org
Subject: RE: [PATCH] crypto: brcm - Support more FlexRM rings than SPU engines.
Need to address few issues in the patch.
So NAKing this patch. Will send out re-vised version.
Regards,
Raveendra
> -----Original Message-----
> From: Raveendra Padasalagi [mailto:raveendra.padasalagi@...adcom.com]
> Sent: 13 July 2017 13:58
> To: Herbert Xu; David S. Miller; Rob Rice; Scott Branden; linux-
> crypto@...r.kernel.org
> Cc: Ray Jui; Steve Lin; bcm-kernel-feedback-list@...adcom.com; linux-
> kernel@...r.kernel.org; Raveendra Padasalagi; stable@...r.kernel.org
> Subject: [PATCH] crypto: brcm - Support more FlexRM rings than SPU
engines.
>
> Enhance code to generically support cases where DMA rings are greater
than or
> equal to number of SPU engines.
> New hardware has underlying DMA engine-FlexRM with 32 rings which can be
> used to communicate to any of the available
> 10 SPU engines.
>
> Fixes: 9d12ba86f818 ("crypto: brcm - Add Broadcom SPU driver")
> Signed-off-by: Raveendra Padasalagi <raveendra.padasalagi@...adcom.com>
> cc: stable@...r.kernel.org
> ---
> drivers/crypto/bcm/cipher.c | 105
+++++++++++++++++++++-----------------------
> drivers/crypto/bcm/cipher.h | 15 ++++---
> 2 files changed, 57 insertions(+), 63 deletions(-)
>
> diff --git a/drivers/crypto/bcm/cipher.c b/drivers/crypto/bcm/cipher.c
index
> cc0d5b9..ecc32d8 100644
> --- a/drivers/crypto/bcm/cipher.c
> +++ b/drivers/crypto/bcm/cipher.c
> @@ -119,7 +119,7 @@ static u8 select_channel(void) {
> u8 chan_idx = atomic_inc_return(&iproc_priv.next_chan);
>
> - return chan_idx % iproc_priv.spu.num_spu;
> + return chan_idx % iproc_priv.spu.num_chan;
> }
>
> /**
> @@ -4527,8 +4527,13 @@ static void spu_functions_register(struct device
> *dev,
> */
> static int spu_mb_init(struct device *dev) {
> - struct mbox_client *mcl = &iproc_priv.mcl[iproc_priv.spu.num_spu];
> - int err;
> + struct mbox_client *mcl = &iproc_priv.mcl;
> + int err, i;
> +
> + iproc_priv.mbox = devm_kcalloc(dev, iproc_priv.spu.num_chan,
> + sizeof(struct mbox_chan *), GFP_KERNEL);
> + if (iproc_priv.mbox == NULL)
> + return -ENOMEM;
>
> mcl->dev = dev;
> mcl->tx_block = false;
> @@ -4537,15 +4542,16 @@ static int spu_mb_init(struct device *dev)
> mcl->rx_callback = spu_rx_callback;
> mcl->tx_done = NULL;
>
> - iproc_priv.mbox[iproc_priv.spu.num_spu] =
> - mbox_request_channel(mcl, 0);
> - if (IS_ERR(iproc_priv.mbox[iproc_priv.spu.num_spu])) {
> - err =
(int)PTR_ERR(iproc_priv.mbox[iproc_priv.spu.num_spu]);
> - dev_err(dev,
> - "Mbox channel %d request failed with err %d",
> - iproc_priv.spu.num_spu, err);
> - iproc_priv.mbox[iproc_priv.spu.num_spu] = NULL;
> - return err;
> + for (i = 0; i < iproc_priv.spu.num_chan; i++) {
> + iproc_priv.mbox[i] = mbox_request_channel(mcl, i);
> + if (IS_ERR(iproc_priv.mbox[i])) {
> + err = (int)PTR_ERR(iproc_priv.mbox[i]);
> + dev_err(dev,
> + "Mbox channel %d request failed with err
%d",
> + i, err);
> + iproc_priv.mbox[i] = NULL;
> + return err;
> + }
> }
>
> return 0;
> @@ -4555,7 +4561,7 @@ static void spu_mb_release(struct platform_device
> *pdev) {
> int i;
>
> - for (i = 0; i < iproc_priv.spu.num_spu; i++)
> + for (i = 0; i < iproc_priv.spu.num_chan; i++)
> mbox_free_channel(iproc_priv.mbox[i]);
> }
>
> @@ -4566,7 +4572,7 @@ static void spu_counters_init(void)
>
> atomic_set(&iproc_priv.session_count, 0);
> atomic_set(&iproc_priv.stream_count, 0);
> - atomic_set(&iproc_priv.next_chan, (int)iproc_priv.spu.num_spu);
> + atomic_set(&iproc_priv.next_chan, (int)iproc_priv.spu.num_chan);
> atomic64_set(&iproc_priv.bytes_in, 0);
> atomic64_set(&iproc_priv.bytes_out, 0);
> for (i = 0; i < SPU_OP_NUM; i++) {
> @@ -4809,46 +4815,41 @@ static int spu_dt_read(struct platform_device
> *pdev)
> const struct of_device_id *match;
> const struct spu_type_subtype *matched_spu_type;
> void __iomem *spu_reg_vbase[MAX_SPUS];
> - int err;
> + struct device_node *dn = pdev->dev.of_node;
> + int err, i;
> +
> + /* Count number of mailbox channels */
> + spu->num_chan = of_count_phandle_with_args(dn, "mboxes",
> +"#mbox-cells");
>
> match = of_match_device(of_match_ptr(bcm_spu_dt_ids), dev);
> matched_spu_type = match->data;
>
> - if (iproc_priv.spu.num_spu > 1) {
> - /* If this is 2nd or later SPU, make sure it's same type
*/
> - if ((spu->spu_type != matched_spu_type->type) ||
> - (spu->spu_subtype != matched_spu_type->subtype)) {
> - err = -EINVAL;
> - dev_err(&pdev->dev, "Multiple SPU types not
> allowed");
> - return err;
> - }
> - } else {
> - /* Record type of first SPU */
> - spu->spu_type = matched_spu_type->type;
> - spu->spu_subtype = matched_spu_type->subtype;
> - }
> + spu->spu_type = matched_spu_type->type;
> + spu->spu_subtype = matched_spu_type->subtype;
>
> - /* Get and map SPU registers */
> - spu_ctrl_regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - if (!spu_ctrl_regs) {
> - err = -EINVAL;
> - dev_err(&pdev->dev, "Invalid/missing registers for
SPU\n");
> - return err;
> - }
> + i = 0;
> + while ((i < MAX_SPUS) && ((spu_ctrl_regs =
> + platform_get_resource(pdev, IORESOURCE_MEM, i)) != NULL))
> {
>
> - spu_reg_vbase[iproc_priv.spu.num_spu] =
> - devm_ioremap_resource(dev, spu_ctrl_regs);
> - if (IS_ERR(spu_reg_vbase[iproc_priv.spu.num_spu])) {
> - err = PTR_ERR(spu_reg_vbase[iproc_priv.spu.num_spu]);
> - dev_err(&pdev->dev, "Failed to map registers: %d\n",
> - err);
> - spu_reg_vbase[iproc_priv.spu.num_spu] = NULL;
> - return err;
> + spu_reg_vbase[i] = devm_ioremap_resource(dev,
> spu_ctrl_regs);
> + if (IS_ERR(spu_reg_vbase[i])) {
> + err = PTR_ERR(spu_reg_vbase[i]);
> + dev_err(&pdev->dev, "Failed to map registers:
%d\n",
> + err);
> + spu_reg_vbase[i] = NULL;
> + return err;
> + }
> + i++;
> }
> + spu->num_spu = i;
> + dev_dbg(dev, "Device has %d SPUs", spu->num_spu);
>
> - dev_dbg(dev, "SPU %d detected.", iproc_priv.spu.num_spu);
> -
> - spu->reg_vbase[iproc_priv.spu.num_spu] = spu_reg_vbase;
> + spu->reg_vbase = devm_kcalloc(dev, spu->num_spu,
> + sizeof(*(spu->reg_vbase)),
GFP_KERNEL);
> + if (spu->reg_vbase == NULL)
> + return -ENOMEM;
> + memcpy(spu->reg_vbase, spu_reg_vbase,
> + spu->num_spu * sizeof(*(spu->reg_vbase)));
>
> return 0;
> }
> @@ -4859,8 +4860,8 @@ int bcm_spu_probe(struct platform_device *pdev)
> struct spu_hw *spu = &iproc_priv.spu;
> int err = 0;
>
> - iproc_priv.pdev[iproc_priv.spu.num_spu] = pdev;
> - platform_set_drvdata(iproc_priv.pdev[iproc_priv.spu.num_spu],
> + iproc_priv.pdev = pdev;
> + platform_set_drvdata(iproc_priv.pdev,
> &iproc_priv);
>
> err = spu_dt_read(pdev);
> @@ -4871,12 +4872,6 @@ int bcm_spu_probe(struct platform_device *pdev)
> if (err < 0)
> goto failure;
>
> - iproc_priv.spu.num_spu++;
> -
> - /* If already initialized, we've just added another SPU and are
done */
> - if (iproc_priv.inited)
> - return 0;
> -
> if (spu->spu_type == SPU_TYPE_SPUM)
> iproc_priv.bcm_hdr_len = 8;
> else if (spu->spu_type == SPU_TYPE_SPU2) @@ -4892,8 +4887,6 @@ int
> bcm_spu_probe(struct platform_device *pdev)
> if (err < 0)
> goto fail_reg;
>
> - iproc_priv.inited = true;
> -
> return 0;
>
> fail_reg:
> diff --git a/drivers/crypto/bcm/cipher.h b/drivers/crypto/bcm/cipher.h
index
> 51dca52..498cdb8 100644
> --- a/drivers/crypto/bcm/cipher.h
> +++ b/drivers/crypto/bcm/cipher.h
> @@ -417,7 +417,7 @@ struct spu_hw {
> u32 (*spu_wordalign_padlen)(u32 data_size);
>
> /* The base virtual address of the SPU hw registers */
> - void __iomem *reg_vbase[MAX_SPUS];
> + void __iomem **reg_vbase;
>
> /* Version of the SPU hardware */
> enum spu_spu_type spu_type;
> @@ -427,10 +427,13 @@ struct spu_hw {
>
> /* The number of SPUs on this platform */
> u32 num_spu;
> +
> + /* The number of SPU channels on this platform */
> + u32 num_chan;
> };
>
> struct device_private {
> - struct platform_device *pdev[MAX_SPUS];
> + struct platform_device *pdev;
>
> struct spu_hw spu;
>
> @@ -470,12 +473,10 @@ struct device_private {
> /* Number of ICV check failures for AEAD messages */
> atomic_t bad_icv;
>
> - struct mbox_client mcl[MAX_SPUS];
> - /* Array of mailbox channel pointers, one for each channel */
> - struct mbox_chan *mbox[MAX_SPUS];
> + struct mbox_client mcl;
>
> - /* Driver initialized */
> - bool inited;
> + /* Array of mailbox channel pointers, one for each channel */
> + struct mbox_chan **mbox;
> };
>
> extern struct device_private iproc_priv;
> --
> 1.9.1
Powered by blists - more mailing lists