From patchwork Wed Nov 16 12:17:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abel Vesa X-Patchwork-Id: 21017 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp108945wru; Wed, 16 Nov 2022 04:23:02 -0800 (PST) X-Google-Smtp-Source: AA0mqf7WphZPeBXYEufK4nDnKRImuleYNtBgCjN80dvUPbPu/13CZH4loL+Bw/XzOoNdkpxJzVjy X-Received: by 2002:aa7:c694:0:b0:461:8efb:3f84 with SMTP id n20-20020aa7c694000000b004618efb3f84mr18647991edq.210.1668601382496; Wed, 16 Nov 2022 04:23:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668601382; cv=none; d=google.com; s=arc-20160816; b=sdKKuBLNzxO9Noww/b0i9nzfE5MjicbnNxpQmgGJhVjsimRG6Q93VNzUJ3Sbpu9Exw x+PmV/6G4X2GOdFGtGoPIAxN8zqSW8G9iC5yz9Y6pkMAkMqhI/SyhjF7QAqJgnwmEwpA DeSLxwwV7enYjQraD9bRZgxMfdP69da1MMtJhbiXifJdpJxIagyMRZR3TqHW8RKxO+tz 8gyLSS+4VXNBRLZ8excWicZQTJSQ/ovTdNJX7dghgSNfW7z+K033Z/cwYatpzSdE2coI GFyf6RzgGi5oD25WN4TgoyQZ8JSHP2c6rZ19pIvMm9FXVgxlogmlkwM8DvQjECFZtt9u IOgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0720H8kB4HUgr4EFjiQxs7KXJ+uOQn0Rzyj9NCfE628=; b=zHwBCpboWdkcrOVIOnfXNMitud1uHanAiFsjDct4G6WWEeJQKaCM5mia4yWJbLPFEz U3gxpXejsMSKKjv8x3fkJ04j1pFERlqHm19Ag+PuwZH4d3TE1JKcwDS4+MxPa/fxzMaI Js/mXjIbT1KeDSbZnfvYfdjMUB/rIW87G+I8d9ROsJhKQkC9eLgIy0wsyT6KV7GRgP07 5tiei57ocj74MMGZxIhL+XFe/Ul9OV7T0TWOFxk+SJ5r2EpFnRl2zCbDXypKqN8QsHGA 4NKrPATrrBOt4MKwI8Bq3MlqRHpVNSuuQ6mEg+vl91BmdeNUAdcmW8Pfwfhv1M1JdBOG pRxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fI22dHdK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ji17-20020a170907981100b0078d9d67841fsi14434889ejc.400.2022.11.16.04.22.37; Wed, 16 Nov 2022 04:23:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fI22dHdK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231734AbiKPMVO (ORCPT + 99 others); Wed, 16 Nov 2022 07:21:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238416AbiKPMUi (ORCPT ); Wed, 16 Nov 2022 07:20:38 -0500 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9C67E8A for ; Wed, 16 Nov 2022 04:18:25 -0800 (PST) Received: by mail-wr1-x42e.google.com with SMTP id a14so29637011wru.5 for ; Wed, 16 Nov 2022 04:18:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0720H8kB4HUgr4EFjiQxs7KXJ+uOQn0Rzyj9NCfE628=; b=fI22dHdKLv9JyW7/VgthqSLtKlqYizA4Msm4NhUsun1GO/pfzcdeMO3IsTw8hIDfct v7NFXmE3xiZFfLHBqFKEFo5Spfpd6nO8EOVLpIa4Fdf2ZnsAH2Z7hp73+WBVJZdCGC+Z cobWAtBp7/EVuAcZCHKzdqGy9SyIh40mWgDYXJel5vjz4KDE/0NmwAYK24CPNoayo6BD GXffwmGvL3HiQlMUS70BFwnYrTlPHh4YpcjxFL9STD7BLvZoXYDOLX3kdGG7qNOaizIC aJV2Y4gzUCVDafKYk85OhRNHDI7Xyz+EkEzHQhZPseI2H5FMaiteFs1zA3Ada2RZBvsO Mjjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0720H8kB4HUgr4EFjiQxs7KXJ+uOQn0Rzyj9NCfE628=; b=fgfK47CblK/2MWEsxGY8iIV4J6gf6H/CC1x7UlDJmAU+g+Is7WTLEpZ60XXBf2UIuT T1ZDD1SkMdlSlzA4jMHDBafzw9ffURz6hM9OMDwm3b7zEk1qebvHB1nSTt3KO8LF019N lflLtmP4uF/liGZQFEbVSeDEaFP9O51FxbVdpND2iMqJo8AW1iVUROKVh3sU7crpfwef SUeRG7QxvQXflKhew66muAGJ8QFHJdNUklevSDVDE6c7KlOgiW+HcgsDSUn7A7GXgU8P XdOQzDCFjtL9bS7pm6NQ4GBYNw2kT9iEuD8NJzhxwOXv0jfXmpXrSn2zpmD8LmyKWjEZ F4AQ== X-Gm-Message-State: ANoB5pnFVFPsTZY1gENgXldgt3GbXVSj441yly7LJ2u4UnGymp4Is1mT puLGNNZkzGOfirA3GRPhbEDBzA== X-Received: by 2002:adf:e812:0:b0:241:7277:990b with SMTP id o18-20020adfe812000000b002417277990bmr13853507wrm.672.1668601103912; Wed, 16 Nov 2022 04:18:23 -0800 (PST) Received: from localhost.localdomain ([94.52.112.99]) by smtp.gmail.com with ESMTPSA id t14-20020a5d42ce000000b00241a8a5bc11sm1090359wrr.80.2022.11.16.04.18.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Nov 2022 04:18:23 -0800 (PST) From: Abel Vesa To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Alim Akhtar , "James E . J . Bottomley" , "Martin K . Petersen" , Avri Altman , Bart Van Assche , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski Cc: Linux Kernel Mailing List , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-scsi@vger.kernel.org Subject: [PATCH 1/2] ufs: host: ufs-qcom: Clear qunipro_g4_sel for HW version major 5 Date: Wed, 16 Nov 2022 14:17:31 +0200 Message-Id: <20221116121732.2731448-2-abel.vesa@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221116121732.2731448-1-abel.vesa@linaro.org> References: <20221116121732.2731448-1-abel.vesa@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749655363620137309?= X-GMAIL-MSGID: =?utf-8?q?1749655363620137309?= On SM8550, depending on the Qunipro, we can run with G5 or G4. For now, when the major version is 5 or above, we go with G5. Therefore, we need to specifically tell UFS HC that. Signed-off-by: Abel Vesa --- drivers/ufs/host/ufs-qcom.c | 4 ++++ drivers/ufs/host/ufs-qcom.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c index ca60a5b0292b..72334aefe81c 100644 --- a/drivers/ufs/host/ufs-qcom.c +++ b/drivers/ufs/host/ufs-qcom.c @@ -227,6 +227,10 @@ static void ufs_qcom_select_unipro_mode(struct ufs_qcom_host *host) ufshcd_rmwl(host->hba, QUNIPRO_SEL, ufs_qcom_cap_qunipro(host) ? QUNIPRO_SEL : 0, REG_UFS_CFG1); + + if (host->hw_ver.major == 0x05) + ufshcd_rmwl(host->hba, QUNIPRO_G4_SEL, 0, REG_UFS_CFG0); + /* make sure above configuration is applied before we return */ mb(); } diff --git a/drivers/ufs/host/ufs-qcom.h b/drivers/ufs/host/ufs-qcom.h index 751ded3e3531..10621055bf7f 100644 --- a/drivers/ufs/host/ufs-qcom.h +++ b/drivers/ufs/host/ufs-qcom.h @@ -36,6 +36,7 @@ enum { /* On older UFS revisions, this register is called "RETRY_TIMER_REG" */ REG_UFS_PARAM0 = 0xD0, REG_UFS_PA_LINK_STARTUP_TIMER = 0xD8, + REG_UFS_CFG0 = 0xD8, REG_UFS_CFG1 = 0xDC, REG_UFS_CFG2 = 0xE0, REG_UFS_HW_VERSION = 0xE4, @@ -75,6 +76,7 @@ enum { /* bit definitions for REG_UFS_CFG1 register */ #define QUNIPRO_SEL BIT(0) +#define QUNIPRO_G4_SEL BIT(5) #define UFS_PHY_SOFT_RESET BIT(1) #define UTP_DBG_RAMS_EN BIT(17) #define TEST_BUS_EN BIT(18)