From patchwork Wed May 2 12:10:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 10375567 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 55C2E60234 for ; Wed, 2 May 2018 12:10:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 476F028E50 for ; Wed, 2 May 2018 12:10:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C8FD28E4A; Wed, 2 May 2018 12:10:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1406D28E48 for ; Wed, 2 May 2018 12:10:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751029AbeEBMKq (ORCPT ); Wed, 2 May 2018 08:10:46 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:46444 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750954AbeEBMKp (ORCPT ); Wed, 2 May 2018 08:10:45 -0400 Received: by mail-lf0-f66.google.com with SMTP id v85-v6so20452146lfa.13 for ; Wed, 02 May 2018 05:10:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=IXJhm6sSpiNmfzylmZvl4gNbjXrqMo1n18Ut9JLV+VY=; b=DZ4hREvxFZTI7TfHSc+cUqhLe8ZpXmgQqgMJqOGVmtFpeB2hgg5cczjeVANL3cT78z /Ra31m+cZ66lREeqOHqEgkx+1EfS+z6cBIsXFXeLN5kq0NPDKlfCOZO+3yhkwXOFDHXG gHJPqtfJCNvK4AbwuPtgf/fn9WyQd8qMcL8h8= 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; bh=IXJhm6sSpiNmfzylmZvl4gNbjXrqMo1n18Ut9JLV+VY=; b=UhqCzN8Am3X6JK18gqXRmfE77j3ekA7hQYiPDN/bmLVGIyoVHBc4xevF+AZeFVV4Mt jy7DFoeV4RAZ3D1LzhpAMR5Oai+S+FJ4QXG0QATVPfuaWR85oO2UjsSP9UaEjY9PGpZ3 Dzs0iCOUEqB1ArM8v03mX/WJwOxZqVzxdhPozch4TkvoJPjuD8YpQFRkPeGieYy8v1Pp GYdwA9zD1+BGLr6lcn67ZV38YPflpRtGdkD1Kw4A/+5j/quWdLogJw4up1jHcJ6gc6nB dj26wD0ziL/cqoOw+YxMoP+lhPr87vUX7Dvggu6kDiKuIrIx6ebvRCsO6FvpRGQs6r8q /KFg== X-Gm-Message-State: ALQs6tDzbV9ZNV37qHOXDO8/FmlRNwr6w2iTuoDdNJitcu+DsIXZC4rx 37UDoUmRLTSLPxfPUhXliarAnZGSWrM= X-Google-Smtp-Source: AB8JxZoe4vAaIjKyIK5DQtKrZsJd3eKZzU1H0d0yuAjOZ1yrCR1FlgN2oQQtvXXOLoxsvGmwlIO9Uw== X-Received: by 2002:a19:1895:: with SMTP id 21-v6mr11405274lfy.39.1525263043759; Wed, 02 May 2018 05:10:43 -0700 (PDT) Received: from uffe-XPS-13-9360.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id y23-v6sm1867526ljh.88.2018.05.02.05.10.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 May 2018 05:10:43 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: michal.pecio@gmail.com Subject: [PATCH 1/3] mmc: rtsx_usb: Use MMC_CAP2_NO_SDIO Date: Wed, 2 May 2018 14:10:35 +0200 Message-Id: <1525263037-16996-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of having to return -EINVAL when requested to send SDIO specific commands, let's set MMC_CAP2_NO_SDIO as it completely prevents them. Signed-off-by: Ulf Hansson --- drivers/mmc/host/rtsx_usb_sdmmc.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c index 7842207..f9faa98 100644 --- a/drivers/mmc/host/rtsx_usb_sdmmc.c +++ b/drivers/mmc/host/rtsx_usb_sdmmc.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -839,17 +838,6 @@ static void sdmmc_request(struct mmc_host *mmc, struct mmc_request *mrq) goto finish_detect_card; } - /* - * Reject SDIO CMDs to speed up card identification - * since unsupported - */ - if (cmd->opcode == SD_IO_SEND_OP_COND || - cmd->opcode == SD_IO_RW_DIRECT || - cmd->opcode == SD_IO_RW_EXTENDED) { - cmd->error = -EINVAL; - goto finish; - } - mutex_lock(&ucr->dev_mutex); mutex_lock(&host->host_mutex); @@ -1333,7 +1321,8 @@ static void rtsx_usb_init_host(struct rtsx_usb_sdmmc *host) MMC_CAP_MMC_HIGHSPEED | MMC_CAP_BUS_WIDTH_TEST | MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25 | MMC_CAP_UHS_SDR50 | MMC_CAP_NEEDS_POLL; - mmc->caps2 = MMC_CAP2_NO_PRESCAN_POWERUP | MMC_CAP2_FULL_PWR_CYCLE; + mmc->caps2 = MMC_CAP2_NO_PRESCAN_POWERUP | MMC_CAP2_FULL_PWR_CYCLE | + MMC_CAP2_NO_SDIO; mmc->max_current_330 = 400; mmc->max_current_180 = 800;