Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3403193pxk; Mon, 28 Sep 2020 17:15:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGMHam/JHMZ1CkVIAGsqz2+uINyO6mkiP9EWa10A6XfW4NaB6VdlBHDgtikmSZNmhluM7I X-Received: by 2002:a05:6402:1b9a:: with SMTP id cc26mr545147edb.30.1601338519209; Mon, 28 Sep 2020 17:15:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601338519; cv=none; d=google.com; s=arc-20160816; b=hM5F3MO1tZdYBgtOZ9FZLDa6ElY+0SIbzQsmZUPAFJcl19rAh+/z4L03SrzcPWcXkh E5gf4UJvg/b8IqK2NKMW3eN3xvjUBIzNV01RQD0s0RqjDR5Dt/7arY98ggVir5UrN7IY GiLHDKqAf10yJIMseZpnl02Rdhhxc8CeLnqpzVIYqB9XQPbQUvv9OmsMOxkTkwk559q3 1hmKeT9UIRBDFvF8vz/zEbsOxXWOX/uD/EmztbKz1Sb2tzig0JDpFslUQcKSO4Ad5rCY lIIruk6MszK4IB/e4g2fkIZAgohqlKZ0eNhCQeb/+WENwD9TiefqzWM4IU2rH5aoo26c gjZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=cU7Ag9stEwt1IzvkS7calmRSvN4o+b90Pfxdn02qUGU=; b=uAdgKr5Y9dNCC/f7jAV4esMxNicDZiV1QZLngpPaw+mweixFJ+L/ZjnX0kciSNlc2G ucbNl5NzXx/2NLIvganGnEHbG2PlTtPoiwhEaxkChbk9z3Rhg/1HzayVHp+29DWmBeFg JKP8I8mmCdG9huSmn1hUqtG1omNBBZJ+xK2HI+bfYAy9pZe5pAJCxAK70H3Pscqi1P1H tDIo/AGgFuFjop/b/SMsuaFKoCWUGpzjshWhJtg5bmkVLj1CWMe6M4COzVcqviPw0OUx B9gmrNMwO6y8FMiIQDdcTeV3saNHvcYd79Ji7OgcCebTo/9yfsgED5StXv4MJlM1fKtx jZZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@broadcom.com header.s=google header.b=enolhUsp; 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=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id rh24si1581868ejb.283.2020.09.28.17.14.51; Mon, 28 Sep 2020 17:15:19 -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; dkim=pass header.i=@broadcom.com header.s=google header.b=enolhUsp; 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=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=broadcom.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727222AbgI2ANE (ORCPT + 99 others); Mon, 28 Sep 2020 20:13:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727218AbgI2ANE (ORCPT ); Mon, 28 Sep 2020 20:13:04 -0400 Received: from mail-pl1-x663.google.com (mail-pl1-x663.google.com [IPv6:2607:f8b0:4864:20::663]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 002F6C0613D4 for ; Mon, 28 Sep 2020 17:13:03 -0700 (PDT) Received: by mail-pl1-x663.google.com with SMTP id x5so15955plo.6 for ; Mon, 28 Sep 2020 17:13:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cU7Ag9stEwt1IzvkS7calmRSvN4o+b90Pfxdn02qUGU=; b=enolhUsp03qOPPNtJMJ5tmi5RSt0Fc/7qSHyqFshtSHMl12nC9gEPFwVLHOwOVCUyb Bd4tehbLT75Tdp3wtXTfDRki0dxgoyYbHxRwDYdxLF2Tw0Fz96+xiwsTGoNS1IXfo+1u 1cCJwUDuqOYEdG8e3aHzSDbEL3hDAOl9/nFzY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cU7Ag9stEwt1IzvkS7calmRSvN4o+b90Pfxdn02qUGU=; b=pEQP7v/3gjHQJgsZgJZCLak+qHTO5tM9lYfByE8d/41hlcAwBhdOyU8ear+tPC9L9J +9Kmm9cFWBVZr/IPJEnfHyVPU+FMKONv7WsauV4vVuAFKYTFol3Cm+qS6RyNcocYiWC8 SGJlnoAVv1E10LgI+Njr5mVXtzz/cTrNVvPvG/5nlAPQOhXnsE1YBHMFyVjrAMmpr/NM r3dR7fXyd6WoP/0VdayJksotqmXMMzjfh1BryKaU47540RQZrX26P0/4kwX9Nw32+swt xwslBfN+9yWewSIrCQWLDcsIay6dKu3ceMVFnvrd8htLisZXFhLBL+tqfQ8AqJ9Yvttj uqeQ== X-Gm-Message-State: AOAM530OOJ3EPdo2ISVa1rmlx+iavNmXQDWaY3KWFQOXX3u3UBYmwMYX WWpJ5cMYhtAysQ9XZvK5HMV6ZTli4fVUZbG6QjaGCJVSr+uI X-Received: by 2002:a17:90a:34cd:: with SMTP id m13mr282735pjf.73.1601338383423; Mon, 28 Sep 2020 17:13:03 -0700 (PDT) Received: from lbrmn-lnxub113.broadcom.net ([192.19.228.250]) by smtp-relay.gmail.com with ESMTPS id t1sm1047973pjr.8.2020.09.28.17.12.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2020 17:13:03 -0700 (PDT) X-Relaying-Domain: broadcom.com From: Scott Branden To: Arnd Bergmann , Greg Kroah-Hartman , Scott Branden Cc: Kees Cook , linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, Desmond Yan , James Hu Subject: [PATCH v4 08/16] misc: bcm-vk: add ioctl load_image Date: Mon, 28 Sep 2020 17:12:01 -0700 Message-Id: <20200929001209.16393-9-scott.branden@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200929001209.16393-1-scott.branden@broadcom.com> References: <20200929001209.16393-1-scott.branden@broadcom.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add ioctl support to issue load_image operation to VK card. Co-developed-by: Desmond Yan Signed-off-by: Desmond Yan Co-developed-by: James Hu Signed-off-by: James Hu Signed-off-by: Scott Branden --- drivers/misc/bcm-vk/bcm_vk.h | 3 + drivers/misc/bcm-vk/bcm_vk_dev.c | 95 ++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) diff --git a/drivers/misc/bcm-vk/bcm_vk.h b/drivers/misc/bcm-vk/bcm_vk.h index 346508daa67f..02c75b2fd6c3 100644 --- a/drivers/misc/bcm-vk/bcm_vk.h +++ b/drivers/misc/bcm-vk/bcm_vk.h @@ -13,6 +13,7 @@ #include #include #include +#include #include #include "bcm_vk_msg.h" @@ -237,6 +238,8 @@ struct bcm_vk { struct bcm_vk_dauth_info dauth_info; + /* mutex to protect the ioctls */ + struct mutex mutex; struct miscdevice miscdev; int devid; /* dev id allocated */ diff --git a/drivers/misc/bcm-vk/bcm_vk_dev.c b/drivers/misc/bcm-vk/bcm_vk_dev.c index b9f095a7905b..cc52d3e6e706 100644 --- a/drivers/misc/bcm-vk/bcm_vk_dev.c +++ b/drivers/misc/bcm-vk/bcm_vk_dev.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -580,6 +581,71 @@ static void bcm_vk_wq_handler(struct work_struct *work) } } +static long bcm_vk_load_image(struct bcm_vk *vk, + const struct vk_image __user *arg) +{ + struct device *dev = &vk->pdev->dev; + const char *image_name; + struct vk_image image; + u32 next_loadable; + enum soc_idx idx; + int image_idx; + int ret = -EPERM; + + if (copy_from_user(&image, arg, sizeof(image))) + return -EACCES; + + if ((image.type != VK_IMAGE_TYPE_BOOT1) && + (image.type != VK_IMAGE_TYPE_BOOT2)) { + dev_err(dev, "invalid image.type %u\n", image.type); + return ret; + } + + next_loadable = bcm_vk_next_boot_image(vk); + if (next_loadable != image.type) { + dev_err(dev, "Next expected image %u, Loading %u\n", + next_loadable, image.type); + return ret; + } + + /* + * if something is pending download already. This could only happen + * for now when the driver is being loaded, or if someone has issued + * another download command in another shell. + */ + if (test_and_set_bit(BCM_VK_WQ_DWNLD_PEND, vk->wq_offload) != 0) { + dev_err(dev, "Download operation already pending.\n"); + return ret; + } + + image_name = image.filename; + if (image_name[0] == '\0') { + /* Use default image name if NULL */ + idx = get_soc_idx(vk); + if (idx == VK_IDX_INVALID) + goto err_idx; + + /* Image idx starts with boot1 */ + image_idx = image.type - VK_IMAGE_TYPE_BOOT1; + image_name = get_load_fw_name(vk, &image_tab[idx][image_idx]); + if (!image_name) { + dev_err(dev, "No suitable image found for type %d", + image.type); + ret = -ENOENT; + goto err_idx; + } + } else { + /* Ensure filename is NULL terminated */ + image.filename[sizeof(image.filename) - 1] = '\0'; + } + ret = bcm_vk_load_image_by_type(vk, image.type, image_name); + dev_info(dev, "Load %s, ret %d\n", image_name, ret); +err_idx: + clear_bit(BCM_VK_WQ_DWNLD_PEND, vk->wq_offload); + + return ret; +} + static void bcm_to_v_reset_doorbell(struct bcm_vk *vk, u32 db_val) { vkwrite32(vk, db_val, BAR_0, VK_BAR0_RESET_DB_BASE); @@ -631,10 +697,38 @@ static int bcm_vk_trigger_reset(struct bcm_vk *vk) return 0; } +static long bcm_vk_ioctl(struct file *file, unsigned int cmd, unsigned long arg) +{ + long ret = -EINVAL; + struct bcm_vk_ctx *ctx = file->private_data; + struct bcm_vk *vk = container_of(ctx->miscdev, struct bcm_vk, miscdev); + void __user *argp = (void __user *)arg; + + dev_dbg(&vk->pdev->dev, + "ioctl, cmd=0x%02x, arg=0x%02lx\n", + cmd, arg); + + mutex_lock(&vk->mutex); + + switch (cmd) { + case VK_IOCTL_LOAD_IMAGE: + ret = bcm_vk_load_image(vk, argp); + break; + + default: + break; + } + + mutex_unlock(&vk->mutex); + + return ret; +} + static const struct file_operations bcm_vk_fops = { .owner = THIS_MODULE, .open = bcm_vk_open, .release = bcm_vk_release, + .unlocked_ioctl = bcm_vk_ioctl, }; static int bcm_vk_on_panic(struct notifier_block *nb, @@ -665,6 +759,7 @@ static int bcm_vk_probe(struct pci_dev *pdev, const struct pci_device_id *ent) return -ENOMEM; kref_init(&vk->kref); + mutex_init(&vk->mutex); err = pci_enable_device(pdev); if (err) { -- 2.17.1