Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1421869pxb; Thu, 28 Jan 2021 16:38:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJwUyR2MEXw/fCLgelcZ5qeuw4m190tsZWk/Fm9pUZeKN/4hEHJRX8J7r3+VHH4wBCiyp4dH X-Received: by 2002:a17:906:796:: with SMTP id l22mr2093616ejc.247.1611880693038; Thu, 28 Jan 2021 16:38:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611880693; cv=none; d=google.com; s=arc-20160816; b=iURZC6FIf0izL8PXMV13u6cTbXnE6QsrebHHbXYuzs51y2W+A+VorTxXWTpM6ZIewL kYb+tX9nSackyItATHbbeBmQ2s9czspd9nfZvOgkAXW9ILfvxuGbtJMRfIwGkjSiLtb8 1Qe3cGr9iBF8lG92/r2lJoHM1jKSoiE7YsiJsih1Jpo2wYImpHzwvaNlhDotv69qusRF /SEpJ9N0ZdMmDc1KlQPMS/HYpsw1r7fA19nW0XW4/b2yYhKtL67UhWKHCSJf2crqT51w Y73OZ+VKGTFBgyK/yGaEJzTdP5W8KNWv8JLVWf1Zthgxx+GzDvrby+xrgi2xXEojnKbk pkiw== 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:dkim-filter; bh=UnZEaouCpZnI8NQk1+8q06EB2ZwQhkF4sACM6/TAqc0=; b=Vt6DE8Xn8wclpopWbaEJTzMI6kEcg73U0JBuASiYYYOF1sFnSMExJmSLxeE94Xh2M6 g1ztlVP3+BEo/rw87SA4Bl/UW+9fvoY+DPg54lrZHaG488Qrf79O/dyJVaYOhcWPq2o4 QXgOL4BaHrk2n39Q2cJyfInlIWHuV0LjGrOIDhaldS2chlYo2p+PP7a9YLp5/MLP2xtz l86Dq5XtyxptfxYnLLNaG0Dy7OLgC4xdtHTgLk/FtKY2+xsJaG1Wm1izAaphUZo/bDNT QyCr3uHOLH4l9HNXwnsXnf4gnT+OpQ7d6BipAnmjU82fxj2feko5BVjCFME3MgQikZmF rErg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@broadcom.com header.s=dkimrelay header.b=RcrFsb7Z; 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 a16si3553123ejt.459.2021.01.28.16.37.48; Thu, 28 Jan 2021 16:38:13 -0800 (PST) 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=dkimrelay header.b=RcrFsb7Z; 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 S231378AbhA2Adt (ORCPT + 99 others); Thu, 28 Jan 2021 19:33:49 -0500 Received: from relay.smtp-ext.broadcom.com ([192.19.221.30]:42648 "EHLO relay.smtp-ext.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231364AbhA2AdB (ORCPT ); Thu, 28 Jan 2021 19:33:01 -0500 Received: from lbrmn-lnxub113.broadcom.net (lbrmn-lnxub113.ric.broadcom.net [10.136.13.65]) by relay.smtp-ext.broadcom.com (Postfix) with ESMTP id 16A2980D0; Thu, 28 Jan 2021 16:30:58 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 relay.smtp-ext.broadcom.com 16A2980D0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1611880261; bh=bQd0SIEIkVCWGxUXiM5yxBPv/iyhr01PKnBuwTbvuyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RcrFsb7ZG4X67HmRN4r4CZ4TkbMrn1KZQKTUZY+aNi32AGEiBO4dhf5eyB99VODi/ 3VHge25hRZQK/QSbx6//QM9Hofdwt5Inrz/hdyqrk+DgyDMOMWuqby/buNPNfrr0bu WkC7Oc+MgjLTX77qlRGAxaqQBwb7D95M0l98sUV0= 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, Olof Johansson , Desmond Yan , James Hu Subject: [PATCH v10 07/13] misc: bcm-vk: add ioctl load_image Date: Thu, 28 Jan 2021 16:30:23 -0800 Message-Id: <20210129003029.10672-8-scott.branden@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210129003029.10672-1-scott.branden@broadcom.com> References: <20210129003029.10672-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 Acked-by: Olof Johansson --- 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 5f0fcfdaf265..726aab71bb6b 100644 --- a/drivers/misc/bcm-vk/bcm_vk.h +++ b/drivers/misc/bcm-vk/bcm_vk.h @@ -12,6 +12,7 @@ #include #include #include +#include #include #include "bcm_vk_msg.h" @@ -220,6 +221,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 79fffb1e6f84..203a1cf2bae3 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); @@ -636,10 +702,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, @@ -670,6 +764,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