Page MenuHomeFreeBSD
Files F158038362

D54513.id.diff
No OneTemporary
Actions

D54513.id.diff
View Options

diff --git a/sys/dev/ufshci/ufshci_dev.c b/sys/dev/ufshci/ufshci_dev.c
--- a/sys/dev/ufshci/ufshci_dev.c
+++ b/sys/dev/ufshci/ufshci_dev.c
@@ -273,40 +273,31 @@
uint32_t pa_granularity, peer_pa_granularity;
uint32_t t_activate, pear_t_activate;
- /*
- * Unipro Version:
- * - 7~15 = Above 2.0, 6 = 2.0, 5 = 1.8, 4 = 1.61, 3 = 1.6, 2 = 1.41,
- * 1 = 1.40, 0 = Reserved
- */
- if (ufshci_uic_send_dme_get(ctrlr, PA_LocalVerInfo,
- &ctrlr->unipro_version))
- return (ENXIO);
- if (ufshci_uic_send_dme_get(ctrlr, PA_RemoteVerInfo,
- &ctrlr->ufs_dev.unipro_version))
- return (ENXIO);
-
- /*
- * PA_Granularity: Granularity for PA_TActivate and PA_Hibern8Time
- * - 1=1us, 2=4us, 3=8us, 4=16us, 5=32us, 6=100us
- */
- if (ufshci_uic_send_dme_get(ctrlr, PA_Granularity, &pa_granularity))
- return (ENXIO);
- if (ufshci_uic_send_dme_peer_get(ctrlr, PA_Granularity,
- &peer_pa_granularity))
- return (ENXIO);
+ if (ctrlr->quirks & UFSHCI_QUIRK_LONG_PEER_PA_TACTIVATE) {
+ /*
+ * PA_Granularity: Granularity for PA_TActivate and
+ * PA_Hibern8Time
+ * - 1=1us, 2=4us, 3=8us, 4=16us, 5=32us, 6=100us
+ */
+ if (ufshci_uic_send_dme_get(ctrlr, PA_Granularity,
+ &pa_granularity))
+ return (ENXIO);
+ if (ufshci_uic_send_dme_peer_get(ctrlr, PA_Granularity,
+ &peer_pa_granularity))
+ return (ENXIO);
- /*
- * PA_TActivate: Time to wait before activating a burst in order to
- * wake-up peer M-RX
- * UniPro automatically sets timing information such as PA_TActivate
- * through the PACP_CAP_EXT1_ind command during Link Startup operation.
- */
- if (ufshci_uic_send_dme_get(ctrlr, PA_TActivate, &t_activate))
- return (ENXIO);
- if (ufshci_uic_send_dme_peer_get(ctrlr, PA_TActivate, &pear_t_activate))
- return (ENXIO);
+ /*
+ * PA_TActivate: Time to wait before activating a burst in order
+ * to wake-up peer M-RX UniPro automatically sets timing
+ * information such as PA_TActivate through the
+ * PACP_CAP_EXT1_ind command during Link Startup operation.
+ */
+ if (ufshci_uic_send_dme_get(ctrlr, PA_TActivate, &t_activate))
+ return (ENXIO);
+ if (ufshci_uic_send_dme_peer_get(ctrlr, PA_TActivate,
+ &pear_t_activate))
+ return (ENXIO);
- if (ctrlr->quirks & UFSHCI_QUIRK_LONG_PEER_PA_TACTIVATE) {
/*
* Intel Lake-field UFSHCI has a quirk. We need to add 200us to
* the PEER's PA_TActivate.
diff --git a/sys/dev/ufshci/ufshci_private.h b/sys/dev/ufshci/ufshci_private.h
--- a/sys/dev/ufshci/ufshci_private.h
+++ b/sys/dev/ufshci/ufshci_private.h
@@ -278,8 +278,6 @@
struct ufshci_device_descriptor dev_desc;
struct ufshci_geometry_descriptor geo_desc;
- uint32_t unipro_version;
-
/* WriteBooster */
bool is_wb_enabled;
bool is_wb_flush_enabled;
@@ -398,7 +396,6 @@
/* UFS Interconnect Layer (UIC) */
struct mtx uic_cmd_lock;
- uint32_t unipro_version;
uint8_t hs_gear;
uint32_t tx_lanes;
uint32_t rx_lanes;

File Metadata

Mime Type
text/plain
Expires
Thu, May 28, 7:29 PM (11 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33591220
Default Alt Text
D54513.id.diff (2 KB)

Event Timeline