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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 472B0C433F5 for ; Thu, 9 Sep 2021 14:44:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2E7F26120E for ; Thu, 9 Sep 2021 14:44:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347276AbhIIOpp (ORCPT ); Thu, 9 Sep 2021 10:45:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344386AbhIIOpj (ORCPT ); Thu, 9 Sep 2021 10:45:39 -0400 Received: from mail-ot1-x331.google.com (mail-ot1-x331.google.com [IPv6:2607:f8b0:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28190C0613BF for ; Thu, 9 Sep 2021 07:29:20 -0700 (PDT) Received: by mail-ot1-x331.google.com with SMTP id m7-20020a9d4c87000000b0051875f56b95so2705153otf.6 for ; Thu, 09 Sep 2021 07:29:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=lMjMEsWMbjnf8xc5swG9XYj2TatZ/2x8xf6lzSjF8aw=; b=uyFgAAZ19DZG1m3sF9942ZzSKJffmazGzqQXymW4iYqALaHydZVLAL1eTN4t/w6aP7 nEKgYDCpsdh6O+C9N09mxFw+xaI7vHKpFbsZVc+Zm34RLV66VDleXEL8gFROZz8wkIWO HrWPvG5JZlIOiTBSgTbitKEn6XgOAeqBGNwBh3rpn+BfhYOgCgHUEgR1BHZtTOOQT/at 73HglobKC2pw9AHod4aRAID+YJZ+FFxGKuhUYvJHQ7Pqq+4nEQXfmzfTsoRJ+nT82rEc t1OZZYr3Mn4F6owndGd+ZPjyhC5Aa1+8u/tEmFCNLtkKagjIWvF7K9+Q+vqzNGdzZyjL 5SdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=lMjMEsWMbjnf8xc5swG9XYj2TatZ/2x8xf6lzSjF8aw=; b=isPplQ+PB1wwGWToZdwIanS3TEvpfej/0lfDBoGTUQe0ZFCZOFdr2uqX1LNjB5g6Mg 2w7J/XwiR7bXOMCIC7wlNnkOI+QpPM134BC8oU9B9X2Kr93ASrRLUjLZpr8wUzcq/dfv wFc6mtwF3kmqJ5QLcd5nLPBfz/bCZiOEzic0E3uLc4wYBc3UWWOmv/PpL2CkcJCEKrVe wu+16XDITA6AlB5EzodHyOPByZ3sZ82QtufjOBl/Xm4aLe8k6FEbZDE23nCSCzBKomoQ hRqmP9m2To2w1vca8womjHOpis5UXnIhbOQwXTufC3i+lHZ3DH2yoTOyuKywMoOYg0/e hvbw== X-Gm-Message-State: AOAM530buhGUVj/4UiCqUBNcG3N1e+4t5lT5eUdTDpxtdjnNWyHYEuD1 JRl6FSaYzkDG5ffI0/rE7lKkeoIgRFVnkroekSGRsg== X-Google-Smtp-Source: ABdhPJxPofWovqiv/Wxm0JhcZV95ESj0954ZorP7bN8QE8IGhrL5gMnfyuiwJK0ACGo/pE5LltkMmbYUVF5zaHhqFwU= X-Received: by 2002:a05:6830:4090:: with SMTP id x16mr103771ott.71.1631197759206; Thu, 09 Sep 2021 07:29:19 -0700 (PDT) MIME-Version: 1.0 References: <20210831110227.50780-1-jasonlai.genesyslogic@gmail.com> In-Reply-To: <20210831110227.50780-1-jasonlai.genesyslogic@gmail.com> From: Ulf Hansson Date: Thu, 9 Sep 2021 16:28:42 +0200 Message-ID: Subject: Re: [PATCH 6/7] mmc: core: Implement content of UHS-II card initialization functions To: Jason Lai Cc: Takahiro Akashi , Adrian Hunter , Jason Lai , linux-mmc , Ben Chuang , =?UTF-8?B?R3JlZ1R1W+adnOWVn+i7kl0=?= Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org On Tue, 31 Aug 2021 at 13:02, Jason Lai wrote: > > From: Jason Lai > > From: Jason Lai > > UHS-II card initialization flow is divided into 2 categories: PHY & Card. > Part 1 - PHY Initialization: > Every host controller may need their own avtivation operation > to establish LINK between controller and card. So we add a new > member function(uhs2_detect_init) in struct mmc_host_ops for host > controller use. > Part 2 - Card Initialization: > This part can be divided into 6 substeps. > 1. Send UHS-II CCMD DEVICE_INIT to card. > 2. Send UHS-II CCMD ENUMERATE to card. > 3. Send UHS-II Native Read CCMD to obtain capabilities in CFG_REG > of card. > 4. Host compares capabilities of host controller and card, > then write the negotiated values to Setting field in CFG_REG > of card through UHS-II Native Write CCMD. > 5. Switch host controller's clock to Range B if it is supported > by both host controller and card. > 6. Execute legacy SD initialization flow. > > Signed-off-by: Jason Lai > --- > drivers/mmc/core/sd_uhs2.c | 918 +++++++++++++++++++++++++++++++++++-- > 1 file changed, 868 insertions(+), 50 deletions(-) > > diff --git a/drivers/mmc/core/sd_uhs2.c b/drivers/mmc/core/sd_uhs2.c > index 24aa51a6d..d9ceee20d 100644 > --- a/drivers/mmc/core/sd_uhs2.c > +++ b/drivers/mmc/core/sd_uhs2.c > @@ -3,6 +3,7 @@ > * Copyright (C) 2021 Linaro Ltd > * > * Author: Ulf Hansson > + * Author: Jason Lai > * > * Support for SD UHS-II cards > */ > @@ -10,29 +11,37 @@ > > #include > #include > +#include > > #include "core.h" > #include "bus.h" > #include "sd.h" > #include "mmc_ops.h" > +#include "sd_uhs2.h" > > static const unsigned int sd_uhs2_freqs[] = { 52000000, 26000000 }; > > -static int sd_uhs2_set_ios(struct mmc_host *host) > +static void sd_uhs2_set_ios(struct mmc_host *host) > { > struct mmc_ios *ios = &host->ios; > > - return host->ops->uhs2_set_ios(host, ios); > + pr_debug("%s: clock=%uHz, bus_mode=%u, power_mode=%u, ", > + mmc_hostname(host), ios->clock, ios->bus_mode, > + ios->power_mode); > + pr_debug("cs=%u, Vdd=%u, width=%u, timing=%u\n", > + ios->chip_select, ios->vdd, 1 << ios->bus_width, > + ios->timing); I see that you are enjoying a lot of debug code. I guess those have been useful during development, but please - we don't need all of these. Try to be a little more selective and keep only a small subset of them. This applies to the whole series, of course. > + > + host->ops->uhs2_set_ios(host, ios); I would expect that this host ops can fail. Therefore, please don't convert functions to void, unless there are really good reasons to. > } > > -static int sd_uhs2_power_up(struct mmc_host *host) > +static void sd_uhs2_power_up(struct mmc_host *host) > { > host->ios.vdd = fls(host->ocr_avail) - 1; > host->ios.clock = host->f_init; > host->ios.timing = MMC_TIMING_SD_UHS2; > host->ios.power_mode = MMC_POWER_UP; > > - return sd_uhs2_set_ios(host); > + sd_uhs2_set_ios(host); Ditto. > } > > static void sd_uhs2_power_off(struct mmc_host *host) > @@ -45,6 +54,43 @@ static void sd_uhs2_power_off(struct mmc_host *host) > sd_uhs2_set_ios(host); > } > > +/* > + * uhs2_cmd_assemble - assemble and build up uhs2 command > + * @cmd: MMC command > + * @uhs2_cmd: UHS2 command > + * @header: Value of packet header > + * @arg: Argument of packet > + * @payload: Payload of packet > + * @plen: Payload length > + * @resp: Buffer for response > + * @resp_len: Response buffer length > + * > + * resp is inputted outside which should be a variable created by caller > + * so caller should handle it. For SD command, there is no uhs2_resp and > + * response should be stored in resp of mmc_command. Please, try to rephrase this section. It's really hard to understand what is expected from the caller here. Additionally, it's good practice to describe what the function really does. Please add that as well. > + */ > +static void uhs2_cmd_assemble(struct mmc_command *cmd, > + struct uhs2_command *uhs2_cmd, > + u16 header, u16 arg, > + u32 *payload, u8 plen, u8 *resp, u8 resp_len) > +{ > + uhs2_cmd->header = header; > + uhs2_cmd->arg = arg; > + uhs2_cmd->payload = payload; > + uhs2_cmd->payload_len = plen * sizeof(u32); > + uhs2_cmd->packet_len = uhs2_cmd->payload_len + 4; > + > + cmd->uhs2_cmd = uhs2_cmd; > + cmd->uhs2_resp = resp; > + cmd->uhs2_resp_len = resp_len; > + > + pr_debug("%s: uhs2_cmd: header=0x%x arg=0x%x\n", > + __func__, uhs2_cmd->header, uhs2_cmd->arg); > + pr_debug("%s: payload_len=%d packet_len=%d resp_len=%d\n", > + __func__, uhs2_cmd->payload_len, uhs2_cmd->packet_len, > + cmd->uhs2_resp_len); Debug again. I will stop commenting on this from now on, you get the point. > +} > + > /* > * Run the phy initialization sequence, which mainly relies on the UHS-II host > * to check that we reach the expected electrical state, between the host and > @@ -52,16 +98,104 @@ static void sd_uhs2_power_off(struct mmc_host *host) > */ > static int sd_uhs2_phy_init(struct mmc_host *host) > { > + int err = 0; > + > + /* > + * Every host controller can assign its own function which is used > + * to initialize PHY. > + */ > + if (host->ops->uhs2_detect_init) { You certainly need to add a few host ops, but I wonder if this one should be optional? > + err = host->ops->uhs2_detect_init(host) > + if (err) { > + pr_err("%s: fail to detect UHS2!\n", > + mmc_hostname(host)); > + err = UHS2_PHY_INIT_ERR; Please don't use UHS-II specific error codes in this way. If possible, please stick with standard error codes that get returned from the ->uhs2_detect_init() ops. > + } > + } > + So, you return 0 below and just ignore the error code from host->ops->uhs2_detect_init(). That looks weird. > return 0; > } > > /* > * Do the early initialization of the card, by sending the device init > -roadcast > - * command and wait for the process to be completed. > + * broadcast command and wait for the process to be completed. If there is a spelling error or some other things that looks wrong in my original patch(es), please fix those instead (and add your signed-off-by tag), rather than doing it on top as here. > */ > static int sd_uhs2_dev_init(struct mmc_host *host) > { > + struct mmc_command cmd = {0}; > + struct uhs2_command uhs2_cmd = {}; > + u32 cnt; > + u32 dap, gap, gap1; > + u16 header = 0, arg = 0; > + u32 payload[1]; > + u8 plen = 1; > + u8 gd = 0, cf = 1; It's good practice to use self-explanatory names of variables, simply because it helps to understand the code. Would you mind improving some of the variable names above? > + u8 resp[6] = {0}; > + u8 resp_len = 6; > + int err; > + > + dap = host->uhs2_caps.dap; > + gap = host->uhs2_caps.gap; > + > + header = UHS2_NATIVE_PACKET | UHS2_PACKET_TYPE_CCMD; > + arg = ((UHS2_DEV_CMD_DEVICE_INIT & 0xFF) << 8) | > + UHS2_NATIVE_CMD_WRITE | > + UHS2_NATIVE_CMD_PLEN_4B | > + (UHS2_DEV_CMD_DEVICE_INIT >> 8); > + > + /* need this for some cards */ > + cmd.busy_timeout = 1000; If you could refer to the SD spec about what timeout that should be used that would be great. Moreover, if nothing is specified about this, then state that too, so we know what goes on here. > + > + for (cnt = 0; cnt < 30; cnt++) { Why loop for 30 times? Is there something that you can refer to in the SD spec about this - or it's just empirically tested? > + payload[0] = ((dap & 0xF) << 12) | > + (cf << 11) | > + ((gd & 0xF) << 4) | > + (gap & 0xF); > + It would be nice to understand (just put a comment here somewhere) of what kind of payload you build here. Perhaps better variable names would help, as stated above. > + uhs2_cmd_assemble(&cmd, &uhs2_cmd, header, arg, Please use sd_uhs2* as prefix for all functions related to UHS-II. Consistency makes it easier to review and maintain code. > + payload, plen, resp, resp_len); > + > + DBG("Begin DEVICE_INIT, header=0x%x, arg=0x%x, payload=0x%x.\n", > + header, arg, payload[0]); > + > + DBG("Sending DEVICE_INIT. Count = %d\n", cnt); > + err = mmc_wait_for_cmd(host, &cmd, 0); > + > + if (err) { > + pr_err("%s: %s: UHS2 CMD send fail, err= 0x%x!\n", > + mmc_hostname(host), __func__, err); > + return -EIO; > + } > + > + if (IS_ENABLED(CONFIG_MMC_DEBUG)) { Please drop this. Use pr_debug or dev_dbg, that should be sufficient. > + int i; > + > + pr_warn("%s: DEVICE_INIT response is: ", > + mmc_hostname(host)); > + for (i = 0; i < resp_len; i++) > + pr_warn("0x%x ", resp[i]); > + pr_warn("\n"); > + } > + > + if (resp[3] != (UHS2_DEV_CMD_DEVICE_INIT & 0xFF)) { > + pr_err("%s: DEVICE_INIT response is wrong!\n", > + mmc_hostname(host)); > + return -EIO; > + } > + > + if (resp[5] & 0x8) { > + DBG("CF is set, device is initialized!\n"); > + host->group_desc = gd; > + break; > + } > + gap1 = resp[4] & 0x0F; > + if (gap == gap1) > + gd++; > + } > + if (cnt == 30) { Looks like a do-while loop may be better suited above, so this can be skipped. Please give it a try and see if that improves the code a bit. > + pr_err("%s: DEVICE_INIT fail, already 30 times!\n", > + mmc_hostname(host)); > + return -EIO; > + } > + > return 0; > } > > @@ -70,8 +204,60 @@ static int sd_uhs2_dev_init(struct mmc_host *host) > * Note that, we currently support only the point to point connection, which > * means only one card can be attached per host/slot. > */ > -static int sd_uhs2_enum(struct mmc_host *host, u32 *node_id) > +static int sd_uhs2_enum(struct mmc_host *host) I am not sure why I added the node_id, probably for a good reason. Anyway, if you think it isn't needed please update the original patch2. > { > + struct mmc_command cmd = {0}; > + struct uhs2_command uhs2_cmd = {}; > + u16 header = 0, arg = 0; > + u32 payload[1]; > + u8 plen = 1; > + u8 id_f = 0xF, id_l = 0x0; Again, please improve variable names. I am stopping from commenting on this again, it applies to the whole series. > + u8 resp[8] = {0}; > + u8 resp_len = 8; > + int err; > + > + header = UHS2_NATIVE_PACKET | UHS2_PACKET_TYPE_CCMD; > + arg = ((UHS2_DEV_CMD_ENUMERATE & 0xFF) << 8) | > + UHS2_NATIVE_CMD_WRITE | > + UHS2_NATIVE_CMD_PLEN_4B | > + (UHS2_DEV_CMD_ENUMERATE >> 8); > + > + payload[0] = (id_f << 4) | id_l; > + > + DBG("Begin ENUMERATE, header=0x%x, arg=0x%x, payload=0x%x.\n", > + header, arg, payload[0]); > + uhs2_cmd_assemble(&cmd, &uhs2_cmd, header, arg, payload, plen, > + resp, resp_len); > + > + err = mmc_wait_for_cmd(host, &cmd, 0); > + if (err) { > + pr_err("%s: %s: UHS2 CMD send fail, err= 0x%x!\n", > + mmc_hostname(host), __func__, err); > + return -EIO; > + } > + > + if (IS_ENABLED(CONFIG_MMC_DEBUG)) { > + int i; > + > + pr_warn("%s: ENUMERATE response is: ", mmc_hostname(host)); > + for (i = 0; i < resp_len; i++) > + pr_warn("0x%x ", resp[i]); > + pr_warn("\n"); > + } > + > + if (resp[3] != (UHS2_DEV_CMD_ENUMERATE & 0xFF)) { > + pr_err("%s: ENUMERATE response is wrong!\n", > + mmc_hostname(host)); > + return -EIO; > + } > + > + id_f = (resp[4] >> 4) & 0xF; > + id_l = resp[4] & 0xF; > + DBG("id_f = %d, id_l = %d.\n", id_f, id_l); > + DBG("Enumerate Cmd Completed. No. of Devices connected = %d\n", > + id_l - id_f + 1); > + host->uhs2_dev_prop.node_id = id_f; > + > return 0; > } > > @@ -80,8 +266,158 @@ static int sd_uhs2_enum(struct mmc_host *host, u32 *node_id) > * commands and by parsing the responses. Store a copy of the relevant data in > * card->uhs2_config. > */ > -static int sd_uhs2_config_read(struct mmc_host *host, struct mmc_card *card) > +static int sd_uhs2_config_read(struct mmc_host *host) The idea with passing the *card as an in-parameter is to allow it to fill uhs2 cap/config. I guess that becomes obvious, when you look at my comment for patch5. Card specific data belongs in the struct mmc_card, not in the mmc_host. > { > + struct mmc_command cmd = {0}; > + struct uhs2_command uhs2_cmd = {}; > + u16 header = 0, arg = 0; > + u32 cap; > + int err; > + > + DBG("INQUIRY_CFG: read Generic Caps.\n"); > + header = UHS2_NATIVE_PACKET | > + UHS2_PACKET_TYPE_CCMD | > + host->uhs2_dev_prop.node_id; > + arg = ((UHS2_DEV_CONFIG_GEN_CAPS & 0xFF) << 8) | > + UHS2_NATIVE_CMD_READ | > + UHS2_NATIVE_CMD_PLEN_4B | > + (UHS2_DEV_CONFIG_GEN_CAPS >> 8); > + > + pr_debug("Begin INQUIRY_CFG, header=0x%x, arg=0x%x.\n", header, arg); > + /* There is no payload because per spec, there should be > + * no payload field for read CCMD. > + * Plen is set in arg. Per spec, plen for read CCMD > + * represents the len of read data which is assigned in payload > + * of following RES (p136). > + */ > + uhs2_cmd_assemble(&cmd, &uhs2_cmd, header, arg, NULL, 0, NULL, 0); > + > + err = mmc_wait_for_cmd(host, &cmd, 0); > + if (err) { > + pr_err("%s: %s: UHS2 CMD send fail, err= 0x%x!\n", > + mmc_hostname(host), __func__, err); > + return -EIO; There is no reason to override the error code from mmc_wait_for_cmd(). Please just use that instead. That applies to many other places below and above as well. Please fix them all. > + } > + > + if (IS_ENABLED(CONFIG_MMC_DEBUG)) { > + int i; > + > + pr_warn("%s: INQUIRY_CFG generic response is: ", > + mmc_hostname(host)); > + for (i = 0; i < 2; i++) > + pr_warn("0x%x ", cmd.resp[i]); > + pr_warn("\n"); > + } > + > + cap = cmd.resp[0]; > + pr_debug("Device Generic Caps (0-31) is: 0x%x.\n", cap); > + host->uhs2_dev_prop.n_lanes = (cap >> UHS2_DEV_CONFIG_N_LANES_POS) & > + UHS2_DEV_CONFIG_N_LANES_MASK; > + host->uhs2_dev_prop.dadr_len = (cap >> UHS2_DEV_CONFIG_DADR_POS) & > + UHS2_DEV_CONFIG_DADR_MASK; > + host->uhs2_dev_prop.app_type = (cap >> UHS2_DEV_CONFIG_APP_POS) & > + UHS2_DEV_CONFIG_APP_MASK; > + > + pr_debug("INQUIRY_CFG: read PHY Caps.\n"); > + arg = ((UHS2_DEV_CONFIG_PHY_CAPS & 0xFF) << 8) | > + UHS2_NATIVE_CMD_READ | > + UHS2_NATIVE_CMD_PLEN_8B | > + (UHS2_DEV_CONFIG_PHY_CAPS >> 8); > + > + pr_debug("Begin INQUIRY_CFG, header=0x%x, arg=0x%x.\n", header, arg); > + uhs2_cmd_assemble(&cmd, &uhs2_cmd, header, arg, NULL, 0, NULL, 0); > + > + err = mmc_wait_for_cmd(host, &cmd, 0); > + if (err) { > + pr_err("%s: %s: UHS2 CMD send fail, err= 0x%x!\n", > + mmc_hostname(host), __func__, err); > + return -EIO; > + } > + > + if (IS_ENABLED(CONFIG_MMC_DEBUG)) { > + int i; > + > + pr_warn("%s: INQUIRY_CFG PHY response is: ", > + mmc_hostname(host)); > + for (i = 0; i < 2; i++) > + pr_warn("0x%x ", cmd.resp[i]); > + pr_warn("\n"); > + } > + > + cap = cmd.resp[0]; > + pr_debug("Device PHY Caps (0-31) is: 0x%x.\n", cap); > + host->uhs2_dev_prop.phy_minor_rev = cap & > + UHS2_DEV_CONFIG_PHY_MINOR_MASK; > + host->uhs2_dev_prop.phy_major_rev = (cap >> > + UHS2_DEV_CONFIG_PHY_MAJOR_POS) & > + UHS2_DEV_CONFIG_PHY_MAJOR_MASK; > + host->uhs2_dev_prop.can_hibernate = (cap >> > + UHS2_DEV_CONFIG_CAN_HIBER_POS) & > + UHS2_DEV_CONFIG_CAN_HIBER_MASK; > + > + cap = cmd.resp[1]; > + pr_debug("Device PHY Caps (32-63) is: 0x%x.\n", cap); > + host->uhs2_dev_prop.n_lss_sync = cap & UHS2_DEV_CONFIG_N_LSS_SYN_MASK; > + host->uhs2_dev_prop.n_lss_dir = (cap >> > + UHS2_DEV_CONFIG_N_LSS_DIR_POS) & > + UHS2_DEV_CONFIG_N_LSS_DIR_MASK; > + if (host->uhs2_dev_prop.n_lss_sync == 0) > + host->uhs2_dev_prop.n_lss_sync = 16 << 2; > + else > + host->uhs2_dev_prop.n_lss_sync <<= 2; > + > + if (host->uhs2_dev_prop.n_lss_dir == 0) > + host->uhs2_dev_prop.n_lss_dir = 16 << 3; > + else > + host->uhs2_dev_prop.n_lss_dir <<= 3; > + > + pr_debug("INQUIRY_CFG: read LINK-TRAN Caps.\n"); > + arg = ((UHS2_DEV_CONFIG_LINK_TRAN_CAPS & 0xFF) << 8) | > + UHS2_NATIVE_CMD_READ | > + UHS2_NATIVE_CMD_PLEN_8B | > + (UHS2_DEV_CONFIG_LINK_TRAN_CAPS >> 8); > + > + pr_debug("Begin INQUIRY_CFG, header=0x%x, arg=0x%x.\n", header, arg); > + uhs2_cmd_assemble(&cmd, &uhs2_cmd, header, arg, NULL, 0, NULL, 0); > + > + err = mmc_wait_for_cmd(host, &cmd, 0); > + if (err) { > + pr_err("%s: %s: UHS2 CMD send fail, err= 0x%x!\n", > + mmc_hostname(host), __func__, err); > + return -EIO; > + } > + > + if (IS_ENABLED(CONFIG_MMC_DEBUG)) { > + int i; > + > + pr_warn("%s: INQUIRY_CFG Link-Tran response is: ", > + mmc_hostname(host)); > + for (i = 0; i < 2; i++) > + pr_warn("0x%x ", cmd.resp[i]); > + pr_warn("\n"); > + } > + > + cap = cmd.resp[0]; > + DBG("Device LINK-TRAN Caps (0-31) is: 0x%x.\n", cap); > + host->uhs2_dev_prop.link_minor_rev = cap & > + UHS2_DEV_CONFIG_LT_MINOR_MASK; > + host->uhs2_dev_prop.link_major_rev = (cap >> > + UHS2_DEV_CONFIG_LT_MAJOR_POS) & > + UHS2_DEV_CONFIG_LT_MAJOR_MASK; > + host->uhs2_dev_prop.n_fcu = (cap >> UHS2_DEV_CONFIG_N_FCU_POS) & > + UHS2_DEV_CONFIG_N_FCU_MASK; > + host->uhs2_dev_prop.dev_type = (cap >> UHS2_DEV_CONFIG_DEV_TYPE_POS) & > + UHS2_DEV_CONFIG_DEV_TYPE_MASK; > + host->uhs2_dev_prop.maxblk_len = (cap >> > + UHS2_DEV_CONFIG_MAX_BLK_LEN_POS) & > + UHS2_DEV_CONFIG_MAX_BLK_LEN_MASK; > + > + cap = cmd.resp[1]; > + DBG("Device LINK-TRAN Caps (32-63) is: 0x%x.\n", cap); > + host->uhs2_dev_prop.n_data_gap = cap & UHS2_DEV_CONFIG_N_DATA_GAP_MASK; > + if (host->uhs2_dev_prop.n_fcu == 0) > + host->uhs2_dev_prop.n_fcu = 256; > + > return 0; > } > > @@ -89,15 +425,393 @@ static int sd_uhs2_config_read(struct mmc_host *host, struct mmc_card *card) > * Based on the card's and host's UHS-II capabilities, let's update the > * configuration of the card and the host. This may also include to move to a > * greater speed range/mode. Depending on the updated configuration, we may > -eed > - * to do a soft reset of the card via sending it a GO_DORMANT_STATE command. > + * need to do a soft reset of the card via sending it a GO_DORMANT_STATE command. > * > - * In the final step, let's check if the card signals "config completion", > -hich > - * indicates that the card has moved from config state into active state. > + * In the final step, let's check if the card signals "config completion", > + * which indicates that the card has moved from config state into active state. > */ > -static int sd_uhs2_config_write(struct mmc_host *host, struct mmc_card *card) > +static int sd_uhs2_config_write(struct mmc_host *host) Again, the struct mmc_card is passed here for a reason. It should contain the config/caps for the card. I think I will just stop reviewing here - as it looks like you have quite some cleanups to fix at this point. I am looking forward to reviewing your next version. [...] Kind regards Uffe