From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB6B3C433DB for ; Tue, 5 Jan 2021 16:22:45 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 73A0822CA0 for ; Tue, 5 Jan 2021 16:22:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 73A0822CA0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=raspberrypi.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kMIqOMEhGJGtlrEoa6vepPO0ix0Jh0Wue/bCRC02usQ=; b=sTr4gKiNABrl7OiRLWh5IvVB/ 2b6lxuqycoZH9A0qYoN0+YsKiR7siaEHOngmZPU43+N8RLLXb2xMEGAwMoTLhvLCvcFtjvgTns45F TN3cid99IUFz/6Pq8rEiGnCVv4Q5K7bGXU4P3LddmCa6GxuL3k4nv9j7uCCFilYfOmfC9D3MkbZY+ O9RSj6YCOXox0f55T1gB0l8tXF4lS3o+eCpEYEMP7Ya6bfwsMn7IP9Ibv95nOY5RBU36UU+KueH5h 1jI9csRt+MUzmrVG7AyHLc0Op/Eh4xcNg3WN6PpvkqNnpVZM257Fs3GlTyRHe29wJ1Q+ZOoRQj50b FgRGmjRNQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwp5C-0000Ke-El; Tue, 05 Jan 2021 16:21:18 +0000 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kwp5A-0000Jl-6E for linux-arm-kernel@lists.infradead.org; Tue, 05 Jan 2021 16:21:16 +0000 Received: by mail-wm1-x32a.google.com with SMTP id y23so102007wmi.1 for ; Tue, 05 Jan 2021 08:21:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NX9GgUhvrdFINxLCVAgA1k2tN4aNPfLwDkftpmTakS4=; b=DHjLS8IzLeEntGuAA9wXm1+luX3XSq9lobGlMYt7iBi9Qp+p7MfB5jmYIjD1vvB/KR SBBKZe6YT/jr3MA2evkNYq1lxxfOgBFioOWFDSUIAsN3ksjsLwaCwigVC7UhosecFosE VZ3/o1CyAEY3yCfD3CyuudgTqDncB2vOGKON2gnLWvSS+rzvacwEhMCM2WdGesj/u9vs ZxlYlfRXUbGuoy/LbzxZA05hdzMa8kUSvNVDhvD1Unp4ZblxV/yoDKdbvRUnYg+tSTso 6Tlr6tHyowr5W7coUDdWVhMumnNz0tazEbSntWa/HcTg711kh7WWboia42hU4xInLcVp FDHw== 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:mime-version:content-transfer-encoding; bh=NX9GgUhvrdFINxLCVAgA1k2tN4aNPfLwDkftpmTakS4=; b=tmtjx8N4cjM8lu1eKH6FOK0fBgBluNkupXSOzQlBCSgaMG1hQG9A2Mp3szO+fCVvLp 8/tiPni7kv7BdIQOWEqaLfYSpXPfmYQd+8TI/OB9FnqQpT4EwqTjpYMKYHu06G+/tJSC mUpXdXbycV6QmENByu+u6TkQailmmXXgQLnWaGe2Y2ayIgJ2dOQE5Iod7iiL+3JqQz/D QVDCYkLT5a8wWqZvTtBkfvXRZxVsvjARgXCXE4Rh1TbRuAGSmVA7dNqO9Gq0/b56VCaG PY68vpr0WBee4d7ivlKoFqp1Tl1rBndOoYu+CW3vzsaN4aW874Tsio68oX5QYrJmCJN2 dwtQ== X-Gm-Message-State: AOAM530sV+7kYDQz/eOjaBi6QOq04oKUeo5JsVCbffVDapiCN2z9Vv8a grpCAnwz88IL2o/77F4K7wEKRA== X-Google-Smtp-Source: ABdhPJxeQeNlXlsMq20TUsc4rPZnAT1HbVfOQWK/vG6xY2/s75TU8LKviTj0s3Y811fzpLHq42i5OA== X-Received: by 2002:a1c:4107:: with SMTP id o7mr27511wma.69.1609863675416; Tue, 05 Jan 2021 08:21:15 -0800 (PST) Received: from buildbot.pitowers.org ([2a00:1098:3142:14:ae1f:6bff:fedd:de54]) by smtp.gmail.com with ESMTPSA id r82sm6654wma.18.2021.01.05.08.21.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Jan 2021 08:21:14 -0800 (PST) From: Phil Elwell To: Nicolas Saenz Julienne , Greg Kroah-Hartman , Arnd Bergmann , Dan Carpenter , Stefan Wahren , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, devel@driverdev.osuosl.org Subject: [PATCH v2 2/3] staging: vchiq: Fix bulk transfers on 64-bit builds Date: Tue, 5 Jan 2021 16:20:29 +0000 Message-Id: <20210105162030.1415213-3-phil@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210105162030.1415213-1-phil@raspberrypi.com> References: <20210105162030.1415213-1-phil@raspberrypi.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210105_112116_275786_3A02FD84 X-CRM114-Status: GOOD ( 13.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Phil Elwell Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The recent change to the bulk transfer compat function missed the fact the relevant ioctl command is VCHIQ_IOC_QUEUE_BULK_TRANSMIT32, not VCHIQ_IOC_QUEUE_BULK_TRANSMIT, as any attempt to send a bulk block to the VPU would have shown. Fixes: a4367cd2b231 ("staging: vchiq: convert compat bulk transfer") Signed-off-by: Phil Elwell --- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index 2a8883673ba1..2ca5805b2fce 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -1717,7 +1717,7 @@ vchiq_compat_ioctl_queue_bulk(struct file *file, { struct vchiq_queue_bulk_transfer32 args32; struct vchiq_queue_bulk_transfer args; - enum vchiq_bulk_dir dir = (cmd == VCHIQ_IOC_QUEUE_BULK_TRANSMIT) ? + enum vchiq_bulk_dir dir = (cmd == VCHIQ_IOC_QUEUE_BULK_TRANSMIT32) ? VCHIQ_BULK_TRANSMIT : VCHIQ_BULK_RECEIVE; if (copy_from_user(&args32, argp, sizeof(args32))) -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel