From patchwork Tue Oct 21 17:19:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 5126651 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CDFD8C11AC for ; Tue, 21 Oct 2014 17:19:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 173A720219 for ; Tue, 21 Oct 2014 17:19:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 96BEF2020F for ; Tue, 21 Oct 2014 17:19:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933221AbaJURTs (ORCPT ); Tue, 21 Oct 2014 13:19:48 -0400 Received: from mail-lb0-f181.google.com ([209.85.217.181]:44325 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933163AbaJURTs (ORCPT ); Tue, 21 Oct 2014 13:19:48 -0400 Received: by mail-lb0-f181.google.com with SMTP id l4so1457782lbv.12 for ; Tue, 21 Oct 2014 10:19:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=F1Eh+zWm55UCf7HpQzhPiAL3wIsY+WA3dOFS61ael5Q=; b=U3wN8zbDKIV0Dy1BZYaobnezrkxqLFprgl4WG/2QhUJY2FoW5g8+st6IYx+x/cS/T1 BmvEYN309CFH8GKVlcZNh/EO2ornS4EaOLMwyr9eHpY2iuf+F6zryjkr7Co+WrJrFUdc RR7svWh099JUFkDGV9Te7RBVZgU/dvgpoU2omecZOF0N67TNdhr0M3ShISK5y5BcUWf0 Q0AF02OiwUh/Bo3v15BXsbLQvjUAet4XvZYWXVrY2JKmStwmmJ9l++gRsBrQ05jPKGry flZgbggoTCVAlRC5Hlav5cvvnZkg+/3ccGhJ+NPG0pz/yrMdkGkGK3k87S31S4vET8go oqkw== X-Gm-Message-State: ALoCoQmzUcDtpAlWLlmJQNsQuOTubA0ZLKhvThKDM6hSafAeOoMGUzyG5jpnljF2Mnho9NKHg8PQ X-Received: by 10.152.43.229 with SMTP id z5mr12324225lal.86.1413911984599; Tue, 21 Oct 2014 10:19:44 -0700 (PDT) Received: from uffe-Latitude-E6430s.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id uh7sm4791085lac.1.2014.10.21.10.19.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 21 Oct 2014 10:19:43 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson , Chris Ball Subject: [PATCH 14/15] mmc: core: Don't handle buffers on stack while fetching CXD registers Date: Tue, 21 Oct 2014 19:19:12 +0200 Message-Id: <1413911953-19012-15-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1413911953-19012-1-git-send-email-ulf.hansson@linaro.org> References: <1413911953-19012-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Due to previous patches, all callers of mmc_send_cxd_data() now allocates their buffers from the heap. This enables us to simplify mmc_send_cxd_data() by removing the support of handling buffers, which are allocated from the stack. Signed-off-by: Ulf Hansson --- drivers/mmc/core/mmc_ops.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index 9a6181b..e04008f 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -264,20 +264,6 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host, struct mmc_command cmd = {0}; struct mmc_data data = {0}; struct scatterlist sg; - void *data_buf; - int is_on_stack; - - is_on_stack = object_is_on_stack(buf); - if (is_on_stack) { - /* - * dma onto stack is unsafe/nonportable, but callers to this - * routine normally provide temporary on-stack buffers ... - */ - data_buf = kmalloc(len, GFP_KERNEL); - if (!data_buf) - return -ENOMEM; - } else - data_buf = buf; mrq.cmd = &cmd; mrq.data = &data; @@ -298,7 +284,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host, data.sg = &sg; data.sg_len = 1; - sg_init_one(&sg, data_buf, len); + sg_init_one(&sg, buf, len); if (opcode == MMC_SEND_CSD || opcode == MMC_SEND_CID) { /* @@ -312,11 +298,6 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host, mmc_wait_for_req(host, &mrq); - if (is_on_stack) { - memcpy(buf, data_buf, len); - kfree(data_buf); - } - if (cmd.error) return cmd.error; if (data.error)