Bart Van Assche
072afaa9bb
ANDROID: kleaf: Update the location of the ufs_qcom driver
...
Patch "scsi: ufs: Split the drivers/scsi/ufs directory" moved the source
code of all UFS drivers. Hence this patch that updates the BUILD.bazel
file.
Bug: 234653003
Change-Id: Ia87a92064bf6d04c4fe49dfadbac9858d8d99def
Signed-off-by: Bart Van Assche <bvanassche@google.com >
2022-06-09 13:35:30 -07:00
Dan Carpenter
b888195fee
UPSTREAM: scsi: ufs: ufshcd: Delete unnecessary NULL check
...
The 'info' pointer points to somewhere in the middle of the 'hba' struct.
It can't possibly be NULL. Delete the NULL check.
Link: https://lore.kernel.org/r/YotFotj43TkB8Rid@kili
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 476e45923bbvanassche@google.com >
2022-06-09 13:35:29 -07:00
Bart Van Assche
2d74ff4319
UPSTREAM: scsi: ufs: Split the drivers/scsi/ufs directory
...
Split the drivers/scsi/ufs directory into 'core' and 'host' directories
under the drivers/ufs/ directory. Move shared header files into the
include/ufs/ directory. This separation makes it clear which header files
UFS drivers are allowed to include (include/ufs/*.h) and which header files
UFS drivers are not allowed to include (drivers/ufs/core/*.h).
Update the MAINTAINERS file. Add myself as a UFS reviewer.
Link: https://lore.kernel.org/r/20220511212552.655341-1-bvanassche@acm.org
Cc: Adrian Hunter <adrian.hunter@intel.com >
Cc: Avri Altman <avri.altman@wdc.com >
Cc: Bean Huo <beanhuo@micron.com >
Cc: Bjorn Andersson <bjorn.andersson@linaro.org >
Cc: Keoseong Park <keosung.park@samsung.com >
Tested-by: Bean Huo <beanhuo@micron.com >
Tested-by: Adrian Hunter <adrian.hunter@intel.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Acked-by: Avri Altman <avri.altman@wdc.com >
Acked-by: Adrian Hunter <adrian.hunter@intel.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit dd11376b9fbvanassche@google.com >
2022-06-09 13:35:29 -07:00
Bean Huo
0dd3530434
UPSTREAM: scsi: ufs: ufshpb: Clean up ufshpb_suspend()/resume()
...
ufshpb_resume() is only called when the HPB state is HPB_SUSPEND, so the
check statement for "ufshpb_get_state(hpb) != HPB_PRESENT" is useless.
Link: https://lore.kernel.org/r/20220505134707.35929-7-huobean@gmail.com
Reviewed-by: Keoseong Park <keosung.park@samsung.com >
Signed-off-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 18ebe2390cbvanassche@google.com >
2022-06-09 13:35:29 -07:00
Bean Huo
4119ade206
UPSTREAM: scsi: ufs: ufshpb: Add handing of device reset regions in HPB device mode
...
In UFS HPB Spec JESD220-3A,
"5.8. Active and inactive information upon power cycle
...
When the device is powered off by the host, the device may restore L2P map
data upon power up or build from the host's HPB READ command. In case
device powered up and lost HPB information, device can signal to the host
through HPB Sense data, by setting HPB Operation as '2' which will inform
the host that device reset HPB information."
Therefore, for HPB device control mode, if the UFS device is reset via the
RST_N pin, the active region information in the device will be reset. If
the host side receives this notification from the device side, it is
recommended to inactivate all active regions in the host's HPB cache.
Link: https://lore.kernel.org/r/20220505134707.35929-6-huobean@gmail.com
Reviewed-by: Keoseong Park <keosung.park@samsung.com >
Reviewed-by: Daejun Park <daejun7.park@samsung.com >
Signed-off-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 32d6eab31abvanassche@google.com >
2022-06-09 13:35:29 -07:00
Bean Huo
26307f0d97
UPSTREAM: scsi: ufs: ufshpb: Change sysfs node hpb_stats/rb_* prefix to start with rcmd_*
...
According to the documentation of the sysfs nodes rb_noti_cnt,
rb_active_cnt and rb_inactive_cnt, these are all related to HPB
recommendation in UPIU response packet. 'rcmd' (recommendation) should be
the correct abbreviation.
Change the sysfs documentation about these sysfs nodes to highlight what
they mean under different HPB control modes.
Link: https://lore.kernel.org/r/20220505134707.35929-5-huobean@gmail.com
Reviewed-by: Keoseong Park <keosung.park@samsung.com >
Signed-off-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit d4300c552bbvanassche@google.com >
2022-06-09 13:35:29 -07:00
Bean Huo
ecde812431
UPSTREAM: scsi: ufs: ufshpb: Clean up the handler when device resets HPB information
...
"When the device is powered off by the host, the device may restore L2P map
data upon power up or build from the host's HPB READ command. In case
device powered up and lost HPB information, device can signal to the host
through HPB Sense data, by setting HPB Operation as '2' which will inform
the host that device reset HPB information."
Clean up the handler and make the intent of this handler more readable, no
functional change.
Link: https://lore.kernel.org/r/20220505134707.35929-4-huobean@gmail.com
Reviewed-by: Keoseong Park <keosung.park@samsung.com >
Reviewed-by: Daejun Park <daejun7.park@samsung.com >
Signed-off-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit a3f3c26d4dbvanassche@google.com >
2022-06-09 13:35:29 -07:00
Bean Huo
96b7da9493
UPSTREAM: scsi: ufs: ufshpb: Remove enum initialization value
...
If the first enumerator has no initializer, the value of the corresponding
constant is zero.
Link: https://lore.kernel.org/r/20220505134707.35929-3-huobean@gmail.com
Reviewed-by: Keoseong Park <keosung.park@samsung.com >
Signed-off-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 6f341ed5e3bvanassche@google.com >
2022-06-09 13:35:28 -07:00
Bean Huo
50460bbd71
UPSTREAM: scsi: ufs: ufshpb: Merge ufshpb_reset() and ufshpb_reset_host()
...
There is no functional change in this patch, just merge ufshpb_reset() and
ufshpb_reset_host() into one function ufshpb_toggle_state().
Link: https://lore.kernel.org/r/20220505134707.35929-2-huobean@gmail.com
Reviewed-by: Keoseong Park <keosung.park@samsung.com >
Signed-off-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit facc239c87bvanassche@google.com >
2022-06-09 13:35:28 -07:00
Manivannan Sadhasivam
92cf8c285a
UPSTREAM: scsi: ufs: qcom: Enable RPM_AUTOSUSPEND for runtime PM
...
In order to allow the block devices to enter autosuspend mode during
runtime, thereby allowing the ufshcd host driver to also runtime suspend,
let's make use of the RPM_AUTOSUSPEND flag.
Without this flag, userspace needs to enable the autosuspend feature of
the block devices through sysfs.
Link: https://lore.kernel.org/r/20220504084212.11605-6-manivannan.sadhasivam@linaro.org
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org >
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 6f21d9274cbvanassche@google.com >
2022-06-09 13:35:28 -07:00
Manivannan Sadhasivam
ebebd5ef5f
UPSTREAM: scsi: ufs: core: Remove redundant wmb() in ufshcd_send_command()
...
The wmb() inside ufshcd_send_command() is added to make sure that the
doorbell is committed immediately. This leads to couple of expectations:
1. The doorbell write should complete before the function return.
2. The doorbell write should not cross the function boundary.
2nd expectation is fullfilled by the Linux memory model as there is a
guarantee that the critical section won't cross the unlock (release)
operation.
1st expectation is not really needed here as there is no following read/
write that depends on the doorbell to be complete implicitly. Even if the
doorbell write is in a CPUs Write Buffer (WB), wmb() won't flush it. And
there is no real need of a WB flush here as well.
So let's get rid of the wmb() that seems redundant.
Link: https://lore.kernel.org/r/20220504084212.11605-5-manivannan.sadhasivam@linaro.org
Reviewed-by: Bart Van Assche <bvanassche@acm.org >
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org >
Acked-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 23803bacaabvanassche@google.com >
2022-06-09 13:35:28 -07:00
Manivannan Sadhasivam
327367068e
UPSTREAM: scsi: ufs: qcom: Add a readl() to make sure ref_clk gets enabled
...
In ufs_qcom_dev_ref_clk_ctrl(), it was noted that the ref_clk needs to be
stable for at least 1us. Even though there is wmb() to make sure the write
gets "completed", there is no guarantee that the write actually reached the
UFS device. There is a good chance that the write could be stored in a
Write Buffer (WB). In that case, even though the CPU waits for 1us, the
ref_clk might not be stable for that period.
So lets do a readl() to make sure that the previous write has reached the
UFS device before udelay().
Also, the wmb() after writel_relaxed() is not really needed. Both writel()
and readl() are ordered on all architectures and the CPU won't speculate
instructions after readl() due to the in-built control dependency with read
value on weakly ordered architectures. So it can be safely removed.
Link: https://lore.kernel.org/r/20220504084212.11605-4-manivannan.sadhasivam@linaro.org
Fixes: f06fcc7155stable@vger.kernel.org
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org >
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 8eecddfca3bvanassche@google.com >
2022-06-09 13:35:28 -07:00
Manivannan Sadhasivam
a44188938c
UPSTREAM: scsi: ufs: qcom: Simplify handling of devm_phy_get()
...
There is no need to call devm_phy_get() if ACPI is used, so skip it. The
host->generic_phy pointer should already be NULL due to the kzalloc(), so
no need to set it NULL again.
While at it, also remove the comment that has no relationship with
devm_phy_get().
Link: https://lore.kernel.org/r/20220504084212.11605-3-manivannan.sadhasivam@linaro.org
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org >
Reviewed-by: Andrew Halaney <ahalaney@redhat.com >
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit c9ed9a6c56bvanassche@google.com >
2022-06-09 13:35:28 -07:00
Manivannan Sadhasivam
74e83bcb8f
UPSTREAM: scsi: ufs: qcom: Fix acquiring the optional reset control line
...
On Qcom UFS platforms, the reset control line seems to be optional (for
SoCs like MSM8996 and probably for others too). The current logic tries to
mimic the devm_reset_control_get_optional() API but it also continues the
probe if there is an error with the declared reset line in DT/ACPI.
In an ideal case, if the reset line is not declared in DT/ACPI, the probe
should continue. But if there is problem in acquiring the declared reset
line (like EPROBE_DEFER) it should fail and return the appropriate error
code.
Link: https://lore.kernel.org/r/20220504084212.11605-2-manivannan.sadhasivam@linaro.org
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org >
Reviewed-by: Andrew Halaney <ahalaney@redhat.com >
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 223b17ed76bvanassche@google.com >
2022-06-09 13:35:28 -07:00
Minghao Chi
09550e3245
UPSTREAM: scsi: ufs: Use pm_runtime_resume_and_get() instead of pm_runtime_get_sync()
...
Using pm_runtime_resume_and_get() to replace pm_runtime_get_sync() and
pm_runtime_put_noidle(). This change is just to simplify the code, no
actual functional changes.
Link: https://lore.kernel.org/r/20220420090353.2588804-1-chi.minghao@zte.com.cn
Reported-by: Zeal Robot <zealci@zte.com.cn >
Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 75b8715e20bvanassche@google.com >
2022-06-09 13:35:27 -07:00
Wan Jiabing
c01d31a66e
UPSTREAM: scsi: ufs: core: Remove duplicate include in ufshcd
...
Fix following checkincludes warning:
drivers/scsi/ufs/ufshcd.c: linux/nls.h is included more than once.
The include is in line 14. Remove the duplicate.
Link: https://lore.kernel.org/r/20220426104509.621394-1-wanjiabing@vivo.com
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Signed-off-by: Wan Jiabing <wanjiabing@vivo.com >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 8ad8edd2fbbvanassche@google.com >
2022-06-09 13:35:27 -07:00
Bart Van Assche
19a65b5076
UPSTREAM: scsi: ufs: Move the ufs_is_valid_unit_desc_lun() definition
...
Move the definition of this function from a public into a private header
file since it is only used inside the UFS core.
Link: https://lore.kernel.org/r/20220419225811.4127248-29-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit a8b032b5b3bvanassche@google.com >
2022-06-09 13:35:27 -07:00
Bart Van Assche
5d99de46b8
UPSTREAM: scsi: ufs: Move the struct ufs_ref_clk definition
...
Move the definition of this data structure since it is only used in a
single source file.
Link: https://lore.kernel.org/r/20220419225811.4127248-28-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 743b09d854bvanassche@google.com >
2022-06-09 13:35:27 -07:00
Bart Van Assche
c32bb82fd9
UPSTREAM: scsi: ufs: Split the ufshcd.h header file
...
Split the ufshcd.h header file into a header file that defines the
interface used by UFS drivers and another header file with declarations and
data structures only used by the UFS core.
Link: https://lore.kernel.org/r/20220419225811.4127248-27-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 4bc26113c6bvanassche@google.com >
2022-06-09 13:35:27 -07:00
Bart Van Assche
de7478829f
UPSTREAM: scsi: ufs: Minimize #include directives
...
Follow the convention that is used elsewhere in the Linux kernel source
code and only include those headers of which the declarations are used
directly.
Link: https://lore.kernel.org/r/20220419225811.4127248-26-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 3f06f7800bbvanassche@google.com >
2022-06-09 13:35:27 -07:00
Bart Van Assche
ab2a9f61fd
UPSTREAM: scsi: ufs: Fix kernel-doc syntax in ufshcd.h
...
This patch fixes all the warnings and errors reported by the following
command:
scripts/kernel-doc -none drivers/scsi/ufs/ufshcd.h
Link: https://lore.kernel.org/r/20220419225811.4127248-25-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit cff91daf52bvanassche@google.com >
2022-06-09 13:35:26 -07:00
Bart Van Assche
dbb9373276
UPSTREAM: scsi: ufs: Remove unnecessary ufshcd-crypto.h include directives
...
ufshcd-crypto.h declares functions that must only be called by the UFS
core. Hence remove the #include "ufshcd-crypto.h" directive from UFS
drivers.
Link: https://lore.kernel.org/r/20220419225811.4127248-24-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Eric Biggers <ebiggers@google.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit c10d52d73abvanassche@google.com >
2022-06-09 13:35:26 -07:00
Bart Van Assche
e8d1bcb857
UPSTREAM: scsi: ufs: qcom: Fix ufs_qcom_resume()
...
Clearing hba->is_sys_suspended if ufs_qcom_resume() succeeds is wrong. That
variable must only be cleared if all actions involved in a resume succeed.
Hence remove the statement that clears hba->is_sys_suspended from
ufs_qcom_resume().
Link: https://lore.kernel.org/r/20220419225811.4127248-23-bvanassche@acm.org
Fixes: 81c0fc51b7beanhuo@micron.com >
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit bee40dc167bvanassche@google.com >
2022-06-09 13:35:26 -07:00
Bart Van Assche
d8d1d7ec78
UPSTREAM: scsi: ufs: Introduce ufshcd_clkgate_delay_set()
...
Since the code to modify delay_ms while holding the host lock occurs twice,
introduce a function that performs this action.
Link: https://lore.kernel.org/r/20220419225811.4127248-22-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit ad8a647e77bvanassche@google.com >
2022-06-09 13:35:26 -07:00
Bart Van Assche
2d122e3802
UPSTREAM: scsi: ufs: Remove locking from around single register writes
...
Single register writes are atomic and hence do not need to be surrounded by
locking. Additionally, MMIO writes are typically posted asynchronously.
Hence, there is no guarantee that these have finished by the time the
spin_unlock*() call has finished. See also the nonposted-mmio property of
the Open Firmware tree. See also pci_iomap().
Link: https://lore.kernel.org/r/20220419225811.4127248-21-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 3fb20fcd93bvanassche@google.com >
2022-06-09 13:35:26 -07:00
Bart Van Assche
97ce892ac4
UPSTREAM: scsi: ufs: Remove the TRUE and FALSE definitions
...
In the Linux kernel coding style document
(Documentation/process/coding-style.rst) it is recommended to use the type
'bool' and also the values 'true' and 'false'. Hence this patch that
removes the definitions and uses of TRUE and FALSE from the UFS driver.
Link: https://lore.kernel.org/r/20220419225811.4127248-20-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 21c2e3418dbvanassche@google.com >
2022-06-09 13:35:26 -07:00
Bart Van Assche
be4c229787
UPSTREAM: scsi: ufs: Remove paths from source code comments
...
Since specifying the path in a source file is redundant, remove the paths
from source code comments.
Link: https://lore.kernel.org/r/20220419225811.4127248-19-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit d0c1725b1ebvanassche@google.com >
2022-06-09 13:35:25 -07:00
Bart Van Assche
bcbe10d414
UPSTREAM: scsi: ufs: Use an SPDX license identifier in the Kconfig file
...
As requested in Documentation/process/license-rules.rst, use an SPDX
license identifier.
Link: https://lore.kernel.org/r/20220419225811.4127248-18-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 2b10863f71bvanassche@google.com >
2022-06-09 13:35:25 -07:00
Bart Van Assche
46ef253523
UPSTREAM: scsi: ufs: Rename sdev_ufs_device into ufs_device_wlun
...
The new name reflects the role of this member variable better: a WLUN
through which the power mode of the UFS device is controlled.
Link: https://lore.kernel.org/r/20220419225811.4127248-17-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit e2106584d0bvanassche@google.com >
2022-06-09 13:35:25 -07:00
Bart Van Assche
558fd80aa7
UPSTREAM: scsi: ufs: Remove the driver version
...
The current version number is 0.2. That driver version was assigned more
than nine years ago. A version number that is not updated while the driver
is updated is not useful. Hence remove the driver version number from the
UFS driver. See also commit e0eca63e34https://lore.kernel.org/r/20220419225811.4127248-16-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit b4ade33b0dbvanassche@google.com >
2022-06-09 13:35:25 -07:00
Bart Van Assche
8a620499b4
UPSTREAM: scsi: ufs: Make the config_scaling_param calls type safe
...
Pass the actual type to config_scaling_param callback as the third argment
instead of a void pointer. Remove a superfluous NULL pointer check from
ufs_qcom_config_scaling_param().
Link: https://lore.kernel.org/r/20220419225811.4127248-15-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit c906e8328dbvanassche@google.com >
2022-06-09 13:35:25 -07:00
Bart Van Assche
a34bbc2365
UPSTREAM: scsi: ufs: Switch to aggregate initialization
...
Make it easier to verify for humans that ufshcd_init_pwr_dev_param()
initializes all structure members. This patch does not change any
functionality.
Link: https://lore.kernel.org/r/20220419225811.4127248-14-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 778d2b0ec6bvanassche@google.com >
2022-06-09 13:35:25 -07:00
Bart Van Assche
8bf192b30c
UPSTREAM: scsi: ufs: Remove unused constants and code
...
Commit 5b44a07b6bhttps://lore.kernel.org/r/20220419225811.4127248-13-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Stanley Chu <stanley.chu@mediatek.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 9474c64e83bvanassche@google.com >
2022-06-09 13:35:25 -07:00
Bart Van Assche
19a799fc71
UPSTREAM: scsi: ufs: Invert the return value of ufshcd_is_hba_active()
...
It is confusing that ufshcd_is_hba_active() returns 'true' if the HBA is
not active. Clear up this confusion by inverting the return value of
ufshcd_is_hba_active(). This patch does not change any functionality.
Link: https://lore.kernel.org/r/20220419225811.4127248-12-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit acbbfe484fbvanassche@google.com >
2022-06-09 13:35:24 -07:00
Bart Van Assche
1a042f80d2
UPSTREAM: scsi: ufs: Declare the quirks array const
...
Declare the quirks array and also its 'model' member const to make it
explicit that these are not modified.
Link: https://lore.kernel.org/r/20220419225811.4127248-11-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit aead21f32abvanassche@google.com >
2022-06-09 13:35:24 -07:00
Bart Van Assche
d6a23949d5
UPSTREAM: scsi: ufs: Rename struct ufs_dev_fix into ufs_dev_quirk
...
Since struct ufs_dev_fix contains quirk information, rename it into struct
ufs_dev_quirk.
Link: https://lore.kernel.org/r/20220419225811.4127248-10-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 25eff2f543bvanassche@google.com >
2022-06-09 13:35:24 -07:00
Bart Van Assche
0b019cd9e3
UPSTREAM: scsi: ufs: Remove the UFS_FIX() and END_FIX() macros
...
Since these two macros reduce code readability, remove them.
Link: https://lore.kernel.org/r/20220419225811.4127248-9-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit dd2cf44ff4bvanassche@google.com >
2022-06-09 13:35:24 -07:00
Bart Van Assche
5f8fd2d6c9
UPSTREAM: scsi: ufs: Use get_unaligned_be16() instead of be16_to_cpup()
...
Use get_unaligned_be16(...) instead of the equivalent but harder to read
be16_to_cpup((__be16 *)...).
Link: https://lore.kernel.org/r/20220419225811.4127248-8-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 9d3ab17e84bvanassche@google.com >
2022-06-09 13:35:24 -07:00
Bart Van Assche
7a975b5e5d
UPSTREAM: scsi: ufs: Remove ufshcd_lrb.sense_buffer
...
ufshcd_lrb.sense_buffer is NULL if ufshcd_lrb.cmd is NULL and
ufshcd_lrb.sense_buffer points at cmd->sense_buffer if ufshcd_lrb.cmd is
set. In other words, the ufshcd_lrb.sense_buffer member is identical to
cmd->sense_buffer. Hence this patch that removes the
ufshcd_lrb.sense_buffer structure member.
Link: https://lore.kernel.org/r/20220419225811.4127248-7-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 1de4378f60bvanassche@google.com >
2022-06-09 13:35:24 -07:00
Bart Van Assche
33d6987272
UPSTREAM: scsi: ufs: Remove ufshcd_lrb.sense_bufflen
...
ufshcd_lrb.sense_bufflen is set but never read. Hence remove this struct
member.
Link: https://lore.kernel.org/r/20220419225811.4127248-6-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Reviewed-by: Keoseong Park <keosung.park@samsung.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit b639b59b44bvanassche@google.com >
2022-06-09 13:35:23 -07:00
Bart Van Assche
c92cce7069
UPSTREAM: scsi: ufs: Simplify statements that return a boolean
...
Convert "if (expr) return true; else return false;" into "return expr;" if
either 'expr' is a boolean expression or the return type of the function is
'bool'.
Link: https://lore.kernel.org/r/20220419225811.4127248-5-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org >
Reviewed-by: Keoseong Park <keosung.park@samsung.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit a858af9a9ebvanassche@google.com >
2022-06-09 13:35:23 -07:00
Bart Van Assche
4fb19dce9e
UPSTREAM: scsi: ufs: Remove superfluous boolean conversions
...
Remove "? true : false" if the preceding expression yields a boolean or if
the result of the expression is assigned to a boolean since in these two
cases the "? true : false" part is superfluous.
Link: https://lore.kernel.org/r/20220419225811.4127248-4-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org >
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 51d1628fc4bvanassche@google.com >
2022-06-09 13:35:23 -07:00
Bart Van Assche
2dc2b1d128
UPSTREAM: scsi: ufs: Declare ufshcd_wait_for_register() static
...
Declare this function static since it is only used inside the ufshcd.c
source file.
Link: https://lore.kernel.org/r/20220419225811.4127248-3-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 59a57bb79ebvanassche@google.com >
2022-06-09 13:35:23 -07:00
Bart Van Assche
44b8c5b189
UPSTREAM: scsi: ufs: Fix a spelling error in a source code comment
...
Change one occurrence of "adpater" into "adapter".
Link: https://lore.kernel.org/r/20220419225811.4127248-2-bvanassche@acm.org
Tested-by: Bean Huo <beanhuo@micron.com >
Reviewed-by: Avri Altman <avri.altman@wdc.com >
Reviewed-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 2abe580023bvanassche@google.com >
2022-06-09 13:35:23 -07:00
Konstantin Vyshetsky
2df89985d1
UPSTREAM: scsi: ufs: core: Increase fDeviceInit poll frequency
...
UFS devices are expected to clear fDeviceInit flag in single digit
milliseconds. Current values of 5 to 10 millisecond sleep add to increased
latency during the initialization and resume path. This CL lowers the sleep
range to 500 to 1000 microseconds.
Link: https://lore.kernel.org/r/20220421002429.3136933-1-bvanassche@acm.org
Acked-by: Avri Altman <avri.altman@wdc.com >
Signed-off-by: Konstantin Vyshetsky <vkon@google.com >
Signed-off-by: Bart Van Assche <bvanassche@acm.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit a4e6496fcabvanassche@google.com >
2022-06-09 13:35:23 -07:00
Po-Wen Kao
e17ad49da7
UPSTREAM: scsi: ufs: core: Remove redundant HPB unmap
...
Since the HPB mapping is already reset in ufshpb_init() by setting flag
QUERY_FLAG_IDN_HPB_RESET, there is no need doing so again in
ufshpb_hpb_lu_prepared().
This also resolves the issue where HPB WRITE BUFFER is issued before UAC is
cleared.
Link: https://lore.kernel.org/r/20220412073131.10644-1-powen.kao@mediatek.com
Acked-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Po-Wen Kao <powen.kao@mediatek.com >
Signed-off-by: Bean Huo <beanhuo@micron.com >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 25a0bf213bbvanassche@google.com >
2022-06-09 13:35:22 -07:00
Krzysztof Kozlowski
d612831d20
UPSTREAM: scsi: ufs: ufshcd-pltfrm: Simplify pdev->dev usage
...
The 'struct device' pointer is already cached as a local variable in
ufshcd_pltfrm_init(), so use it.
Link: https://lore.kernel.org/r/20220401085050.119323-1-krzysztof.kozlowski@linaro.org
Reviewed-by: Chanho Park <chanho61.park@samsung.com >
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 9ad659be37bvanassche@google.com >
2022-06-09 13:35:22 -07:00
Bart Van Assche
262a7bbdcc
ANDROID: scsi: ufs: Do not use the struct scsi_request cmd field
...
This patch is a subset of the upstream commit ce70fd9a55bvanassche@google.com >
2022-06-09 13:35:22 -07:00
Krzysztof Kozlowski
8206d48ec2
UPSTREAM: scsi: ufs: qcom: Drop custom Android boot parameters
...
The QCOM UFS driver requires an androidboot.bootdevice command line
argument matching the UFS device name. If the name is different, it
refuses to probe. This androidboot.bootdevice is provided by stock/vendor
(from an Android-based device) bootloader.
This does not make sense from Linux point of view. Driver should be able
to boot regardless of bootloader. Driver should not depend on some Android
custom environment data.
Link: https://lore.kernel.org/r/20220321151853.24138-1-krzk@kernel.org
Tested-by: Amit Pundir <amit.pundir@linaro.org >
Tested-by: Luca Weiss <luca.weiss@fairphone.com >
Reviewed-by: Brian Masney <bmasney@redhat.com >
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org >
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com >
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 5ca0faf9c2bvanassche@google.com >
2022-06-09 13:35:22 -07:00
Keoseong Park
6e2ea6e76d
UPSTREAM: scsi: ufs: core: Remove unused field in struct ufs_hba
...
Remove unused fields 'rpm_lvl_attr' and 'spm_lvl_attr' in struct ufs_hba.
Commit cbb6813ee7https://lore.kernel.org/r/413601558.101648105683746.JavaMail.epsvc@epcpadp4
Reviewed-by: Bart Van Assche <bvanassche@acm.org >
Acked-by: Avri Altman <avri.altman@wdc.com >
Signed-off-by: Keoseong Park <keosung.park@samsung.com >
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com >
Bug: 234653003
(cherry picked from commit 8ee15ea779bvanassche@google.com >
2022-06-09 13:35:22 -07:00
