From patchwork Thu Oct 25 18:16:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 149543 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1671503ljp; Thu, 25 Oct 2018 11:16:47 -0700 (PDT) X-Received: by 2002:a17:902:a412:: with SMTP id p18-v6mr255265plq.338.1540491407127; Thu, 25 Oct 2018 11:16:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540491407; cv=none; d=google.com; s=arc-20160816; b=GCCo27OkQR2V9fNhxWZyFJYD8bw9eACJyDk5nVlywoEcCGdtFiu0DClOpt71ldfVqj ZtytH3liOijG26wTdmdjcUzA47aXNyJIgvZbn7fduP+Srr/J1Rvl5whbqaWv5VEOTxcA ru9zEgiJBiWvRDwDCIai2pzJ9X8pcO5pWWvVrDMmRZSzt681qyjZLF0RFR1cwij27nlt MZmlSs7eM7UsyOPxyhrke0dLQrGdc9kL+tTt0rYRn8Trxlb5XRididWbmLq7Ok6fiMVE eZddqF0Ez8+3OWzIcf0HGiJ/yc+ULsHiwdghCmUJbWgBxaGpRMgY/FwOm2nP61ATXVrc 4GBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=RPOZBbzyjbHOPhK8IbljRcHoNrKUr7CmrN5SSf/RjRQ=; b=UlYXvPMJdR8eVGbYQ7NuIUr73im1zTm0BNBZORAd0X9mm79cH3yzMAIsmnbABeQkpo D2fCUN8Zx3s0A1TR8Kasgid6pxzSLUAv0I/loN79M6PL40P3VsVgmVRqu6ae5ij/UzDI CTNmp8C/OIvrYJpp8Ogn2/4CLjtcRNzld0DRgg0q07Zu12rwMIhtaSO4nJEz4i3b/PWZ fjHG9hOK7jYPGeVRW7wIGBB6lpe3m2oatcKMwaaGqyZVckYSgZzQEPUPCwnjXpI6/n64 0i+oiQ1wLVAKh6jecpv+k4FNHnE7fR289VSmZbpwvf/ZsfYLD/RGZMkUkUFVx2a4vBN8 hCSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UbtMX54F; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id h4-v6sor6820114plk.55.2018.10.25.11.16.46 for (Google Transport Security); Thu, 25 Oct 2018 11:16:47 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UbtMX54F; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=RPOZBbzyjbHOPhK8IbljRcHoNrKUr7CmrN5SSf/RjRQ=; b=UbtMX54FxCSZrM36Kbe/uISzTjzzFZF/hJsovQCRTiQoTxr7q9yiEI+7P/YuVIJ9p5 L6TaoQjbpXyiyXtBWsGPvomYtptRhylEdUWu+ZUX+pp3sbjSHIUtDIkdnrA8BoZhFNSV /+KozqCX+VRt0CFOgKG+I6RcFWsZfJ8Jh9fmY= 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=RPOZBbzyjbHOPhK8IbljRcHoNrKUr7CmrN5SSf/RjRQ=; b=P6oNrzzb/z74jwL3AQz9wQYVlqwXrD2TTzAXcs2y4I7JOn513tGCArhLALkVnCvmbW W7HQkFhYTMSV9Px1YZIoOtEWVESOxd2y40k6+6BDkbQ5S9J8JumUHqb1ekSq6a/6SyiJ tFEPFWMrLQwPgYVC1tPLlD0lzIWrC/ylYRehdFBo7PGs29V1dYZRqKBaRvtabHvw7Kp/ wrXOV+kY+1e9FBWqdvTflBINel4274J7PzJEKErz9iXGrIUZSN3udQm6JH1nGSLF/r5M VR0ZV8aZLkjNCqB8KkUk2gYL/upGywtqp9gdnTI4Td9U3OtpeytuIoU+uy/uaHoiYlGe 5DYA== X-Gm-Message-State: AGRZ1gJJ9RNHXYbssSHcz2XJ/HURag1RHYi/smAUtV8Fbkp5rphcJpI+ kZbFDSDF3McBu4p1ZIRw/4P3S8kB X-Google-Smtp-Source: AJdET5fqjgSF01pZk95UDUiCSU/XjMr4rjUj24/84mGflZfFCoEdUXU/OEe4P6RxZ50L+Aw4kCTaMw== X-Received: by 2002:a17:902:8d88:: with SMTP id v8-v6mr254674plo.21.1540491406315; Thu, 25 Oct 2018 11:16:46 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id r23-v6sm10725700pgm.48.2018.10.25.11.16.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Oct 2018 11:16:44 -0700 (PDT) From: John Stultz To: lkml Cc: Wei Li , Vinayak Holikatti , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org, Dmitry Shmidt , John Stultz Subject: [PATCH v3] scsi: ufs: Fix hynix ufs bug with quirk on hi36xx SoC Date: Thu, 25 Oct 2018 11:16:40 -0700 Message-Id: <1540491400-16141-1-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 From: Wei Li Hynix ufs has deviations on hi36xx platform which will result in ufs bursts transfer failures. To fix the problem, the Hynix device must set the register VS_DebugSaveConfigTime to 0x10, which will set time reference for SaveConfigTime is 250 ns. The time reference for SaveConfigTime is 40 ns by default. This patch is necessary to boot on HiKey960 boards that use Hynix UFS chips (H28U62301AMR model: hB8aL1). Cc: Vinayak Holikatti Cc: "James E.J. Bottomley" Cc: "Martin K. Petersen" Cc: linux-scsi@vger.kernel.org Signed-off-by: Wei Li Signed-off-by: Dmitry Shmidt [jstultz: Forward ported from older code, slight tweak to commit message] Signed-off-by: John Stultz --- v2: * Narrowed the UFS chip model to the specific model where the issue has been seen. (SKhynix H28U62301AMR model: hB8aL1) * Reworked logic to be contained in ufs-hisi.c since it seems to be a controller issue that crops up with this specific chip v3: * Reworked back to using generic hba quriks which we then key on in the hisi driver. --- drivers/scsi/ufs/ufs-hisi.c | 9 +++++++++ drivers/scsi/ufs/ufs_quirks.h | 6 ++++++ drivers/scsi/ufs/ufshcd.c | 2 ++ 3 files changed, 17 insertions(+) -- 2.7.4 diff --git a/drivers/scsi/ufs/ufs-hisi.c b/drivers/scsi/ufs/ufs-hisi.c index 46df707..452e19f 100644 --- a/drivers/scsi/ufs/ufs-hisi.c +++ b/drivers/scsi/ufs/ufs-hisi.c @@ -20,6 +20,7 @@ #include "unipro.h" #include "ufs-hisi.h" #include "ufshci.h" +#include "ufs_quirks.h" static int ufs_hisi_check_hibern8(struct ufs_hba *hba) { @@ -390,6 +391,14 @@ static void ufs_hisi_set_dev_cap(struct ufs_hisi_dev_params *hisi_param) static void ufs_hisi_pwr_change_pre_change(struct ufs_hba *hba) { + if (hba->dev_quirks & UFS_DEVICE_QUIRK_HOST_VS_DEBUGSAVECONFIGTIME) { + pr_info("ufs flash device must set VS_DebugSaveConfigTime 0x10\n"); + /* VS_DebugSaveConfigTime */ + ufshcd_dme_set(hba, UIC_ARG_MIB(0xD0A0), 0x10); + /* sync length */ + ufshcd_dme_set(hba, UIC_ARG_MIB(0x1556), 0x48); + } + /* update */ ufshcd_dme_set(hba, UIC_ARG_MIB(0x15A8), 0x1); /* PA_TxSkip */ diff --git a/drivers/scsi/ufs/ufs_quirks.h b/drivers/scsi/ufs/ufs_quirks.h index 71f73d1..5d2dfdb 100644 --- a/drivers/scsi/ufs/ufs_quirks.h +++ b/drivers/scsi/ufs/ufs_quirks.h @@ -131,4 +131,10 @@ struct ufs_dev_fix { */ #define UFS_DEVICE_QUIRK_HOST_PA_SAVECONFIGTIME (1 << 8) +/* + * Some UFS devices require VS_DebugSaveConfigTime is 0x10, + * enabling this quirk ensure this. + */ +#define UFS_DEVICE_QUIRK_HOST_VS_DEBUGSAVECONFIGTIME (1 << 9) + #endif /* UFS_QUIRKS_H_ */ diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index c55f38e..9c6cac9 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -230,6 +230,8 @@ static struct ufs_dev_fix ufs_fixups[] = { UFS_FIX(UFS_VENDOR_SKHYNIX, UFS_ANY_MODEL, UFS_DEVICE_NO_VCCQ), UFS_FIX(UFS_VENDOR_SKHYNIX, UFS_ANY_MODEL, UFS_DEVICE_QUIRK_HOST_PA_SAVECONFIGTIME), + UFS_FIX(UFS_VENDOR_SKHYNIX, "hB8aL1" /*H28U62301AMR*/, + UFS_DEVICE_QUIRK_HOST_VS_DEBUGSAVECONFIGTIME), END_FIX };