From patchwork Fri Jan 11 08:30:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1023444 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HMYfKMyg"; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43bbfT5tkVz9sN9; Fri, 11 Jan 2019 19:30:41 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ghsD6-0005A8-Pi; Fri, 11 Jan 2019 08:30:36 +0000 Received: from mail-pl1-f196.google.com ([209.85.214.196]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ghsD4-000589-HF for kernel-team@lists.ubuntu.com; Fri, 11 Jan 2019 08:30:34 +0000 Received: by mail-pl1-f196.google.com with SMTP id a14so6452861plm.12 for ; Fri, 11 Jan 2019 00:30:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uDY32gdHPp0+hcSys90ZH38YoxaYn1AFsALyOCfVC0I=; b=HMYfKMygByovmakuguMccTYuddQouL27l7a/4Uy9+HrdrrpPruPU6QLRsfnKfuLlKW P9mKjYHBvM9E2UfUGaF09eYD/GMIWUI0ST6R00fd6Ep30Y7TIXD6oFlDgDkyzESNjadF s31mpojxW5ABD0WGfIyGduLWmoU9ZqQ0T11L/FxbeocT2phMt1QOp5xMiVRTehDigA6v JoVpOC/JghETVQ+mBmWIr43LkYsERozt7PDhEUBYC7gnhlFNeMdiJdPvkVxDGPfTiaOh IM/WVgELq9aALqw13gW9hqq+fHDb0+2iJOzYxiT8vysvPsUEDwncU2UktiUa4VWNYLIR eI6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=uDY32gdHPp0+hcSys90ZH38YoxaYn1AFsALyOCfVC0I=; b=VLJZdOux3LnuAkQrj70NiZU5jW5prKqSaD/XA+7GxjUIXMHU0r7CI+pHpqO0Kq5hqZ nR9obT8YRQG+w4IujRv3idyR3kFdSwFa33uTXv6kj8dGYSjDDcrVTEcd5g71T4y1So1W UVLoU0nPgnDp5ApMZNT3iG2FHoGZ0KivPttJUtjzd8ujMsGzK1PyARW0cDM2hRCdHWMD /AFtDXDQkeF05IeSPat5yrTmsC2xS68l2uoTLn+IQR3MzgHLGIQV+gpZEpI1Dd5dcjA7 jLGUPgvP82FY9MP0qHmpIneLH5QHuW2fmU7e/GJ6Zu5oEWPvvbrMI/waCr0bDu+yIB8H 9GQg== X-Gm-Message-State: AJcUukeb5CIj9He3zll7JlCbbg8XzUiar6xgWeUq2NWxRWcZMLh6O7ys 5HgqCQ/zZpWJSL7oNGhMeskahg4OxpU= X-Google-Smtp-Source: ALg8bN4DFNTBXaefldCf5pc7ItCN0atPj85pVyoMgsPyZ8NeGdm7iyEw95q6dbo3E7RTqhmeXthLEg== X-Received: by 2002:a17:902:3143:: with SMTP id w61mr13980499plb.253.1547195432771; Fri, 11 Jan 2019 00:30:32 -0800 (PST) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id l5sm90308891pgp.82.2019.01.11.00.30.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Jan 2019 00:30:32 -0800 (PST) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 04/12][SRU][B][C][D][OEM-B] mmc: rtsx_usb: Use MMC_CAP2_NO_SDIO Date: Fri, 11 Jan 2019 16:30:11 +0800 Message-Id: <20190111083019.32135-5-acelan.kao@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190111083019.32135-1-acelan.kao@canonical.com> References: <20190111083019.32135-1-acelan.kao@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Ulf Hansson BugLink: https://bugs.launchpad.net/bugs/1811337 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 Tested-by: Michał Pecio (cherry picked from commit 4b7d45451dff133b6453cb9571ea5349be1ce14f) Signed-off-by: AceLan Kao --- 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 bb0ec00ef357..96ddb3d3f80f 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); @@ -1337,7 +1325,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;