Add support UHS-II for GL9755 and GL9767
v20 cover Add support UHS-II for GL9755 and GL9767
From: Victor Shih <[email protected]>
Summary
=======
These patches[1] support UHS-II and fix GL9755 and GL9767 UHS-II compatibility.
About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.
2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).
3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.
Patch structure
===============
patch#1-#7: for core
patch#8-#20: for sdhci
patch#21: for GL9755
patch#22: for GL9767
Tests
=====
Ran 'dd' command to evaluate the performance 3 times:
(SanDisk UHS-II card on GL9755 controller)
Read Write
UHS-II disabled (UHS-I): 84.5MB/s 54.1MB/s
UHS-II enabled : 190MB/s 74.4MB/s
Read Write
UHS-II disabled (UHS-I): 85.4MB/s 56.2MB/s
UHS-II enabled : 169MB/s 75.2MB/s
Read Write
UHS-II disabled (UHS-I): 83.3MB/s 54.2MB/s
UHS-II enabled : 187MB/s 77.1MB/s
(SanDisk UHS-II card on GL9767 controller)
Read Write
UHS-II disabled (UHS-I): 84.9MB/s 56.5MB/s
UHS-II enabled : 189MB/s 76.4MB/s
Read Write
UHS-II disabled (UHS-I): 85.2MB/s 48.5MB/s
UHS-II enabled : 209MB/s 75.4MB/s
Read Write
UHS-II disabled (UHS-I): 85.6MB/s 50.2MB/s
UHS-II enabled : 185MB/s 78.3MB/s
Test command
=====
Read: dd if=/dev/mmcxxx of=/dev/null bs=4096k count=2000 iflag=direct Write:dd if=/dev/zero of=/dev/mmcxxx bs=4096k count=2000 oflag=direct
Changes in v20 (September. 05, 2024)
* Rebase on latest mmc/next.
* Patch#21: Remove sdhci_gli_enable_internal_clock functon unused clk_ctrl variable.
Make a function sdhci_gli_wait_software_reset_done() for gl9755 reset.
* Patch#22: Use the function sdhci_gli_wait_software_reset_done()
for gl9767 reset.
Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
----------------- original cover letter from v19 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 and GL9767 UHS-II compatibility.
About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.
2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).
3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.
Patch structure
===============
patch#1-#7: for core
patch#8-#20: for sdhci
patch#21: for GL9755
patch#22: for GL9767
Tests
=====
Ran 'dd' command to evaluate the performance:
(SanDisk UHS-II card on GL9755 controller)
Read Write
UHS-II disabled (UHS-I): 84.8MB/s 53.6MB/s
UHS-II enabled : 183MB/s 90.8MB/s
(SanDisk UHS-II card on GL9767 controller)
Read Write
UHS-II disabled (UHS-I): 83.3MB/s 51.6MB/s
UHS-II enabled : 202MB/s 73.3MB/s
Changes in v19 (August. 29, 2024)
* Rebase on latest mmc/next.
* Patch#16: cmd->uhs2_cmd->uhs2_resp is always true, remove it from safety check in the __sdhci_uhs2_finish_command().
* Patch#17: Corrected sdhci_uhs2_reset() parameter errors in the sdhci_uhs2_request_done().
* Patch#21: Add sdhci_gli_enable_internal_clock() to simplify the code
in the sdhci_gl9755_reset().
* Patch#22: Use sdhci_gli_enable_internal_clock() to simplify the code in the sdhci_gl9767_reset().
Directly reading the SDHCI_PRESENT_STATE register to replace the get_cd() avoids the possibility of the get_cd() sleeping in the sdhci_gl9767_set_card_detect_debounce_time(). Refine the position of gli_set_9767() in the sdhci_gl9767_reset().
Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
----------------- original cover letter from v18 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 and GL9767 UHS-II compatibility.
About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.
2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).
3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.
Patch structure
===============
patch#1-#7: for core
patch#8-#20: for sdhci
patch#21: for GL9755
patch#22: for GL9767
Tests
=====
Ran 'dd' command to evaluate the performance:
(SanDisk UHS-II card on GL9755 controller)
Read Write
UHS-II disabled (UHS-I): 83.9MB/s 48.6MB/s
UHS-II enabled : 199MB/s 74.3MB/s
(SanDisk UHS-II card on GL9767 controller)
Read Write
UHS-II disabled (UHS-I): 83.6MB/s 50.1MB/s
UHS-II enabled : 183MB/s 77.8MB/s
Changes in v18 (August. 02, 2024)
* Rebase on latest mmc/next.
* Patch#17: Modify the judgment condition in sdhci_uhs2_reset_cmd_data() and replace it from mmc_card_uhs2()
to host->mmc->uhs2_sd_tran flag.
* Patch#22: Add new register settings for gl9767.
Add card_event in the sdhci_ops for gl9767.
Add sdhci_gl9767_set_card_detect_debounce_time() to configure the gl9767.
Adjust the sdhci_gl9767_reset() process for gl9767.
Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
----------------- original cover letter from v17 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 and GL9767 UHS-II compatibility.
About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.
2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).
3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.
Patch structure
===============
patch#1-#7: for core
patch#8-#20: for sdhci
patch#21: for GL9755
patch#22: for GL9767
Changes in v17 (June. 20, 2024)
* Rebase on latest mmc/next.
* Drop patch#8 of uhs2 patches series v16.
* Patch#11: Move the sdhci_uhs2_reset_cmd_data() to the other patch it was used for the first time.
* Patch#12: Export sdhci_uhs2_set_power() function.
* Patch#16: Add new parameter to __sdhci_finish_data_common().
* Patch#17: Add sdhci_uhs2_reset_cmd_data() and sdhci_uhs2_needs_reset() to resolve the data error or cmd error.
* Patch#21: Rname gl9755_overcurrent_event_enable() to sdhci_gli_overcurrent_event_enable().
* Patch#22: Use mmc_card_uhs2() to simplify the code in the
sdhci_gl9767_reset().
Use mmc_card_uhs2() to simplify the code in the
sdhci_gl9767_set_power().
Add sdhci_gli_overcurrent_event_enable() to
sdhci_gl9767_set_power().Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
----------------- original cover letter from v16 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 and GL9767 UHS-II compatibility.
About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.
2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).
3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.
Patch structure
===============
patch#1-#8: for core
patch#9-#21: for sdhci
patch#22: for GL9755
patch#23: for GL9767
Changes in v16 (May. 22, 2024)
* rebased to the linux-kernel-v6.9.0-rc2 in Ulf Hansson next branch.
* according to the comments provided by Adrian Hunter to modify the patches base on the [V14 00/21] Add support UHS-II for GL9755.
* Patch#8: Separate the Error Recovery mechanism from patch#7 to patch#8.
* Patch#16: Remove irrelevant definition in the sdhci_calc_timeout_uhs2().
Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
----------------- original cover letter from v15 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 and GL9767 UHS-II compatibility.
About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.
2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).
3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.
Patch structure
===============
patch#1-#7: for core
patch#8-#20: for sdhci
patch#21: for GL9755
patch#22: for GL9767
Changes in v15 (April. 22, 2024)
* rebased to the linux-kernel-v6.9.0-rc2 in Ulf Hansson next branch.
* according to the comments provided by Adrian Hunter to modify the patches base on the [V14 00/21] Add support UHS-II for GL9755.
* Patch#07: Move struct uhs2_command uhs2_cmd to struct mmc_request and modify whatever other changers to make it work. Refer the SD Host Controller Standard Specification Section 3.10 to add Error Recovery mechanism to recover the command error.
* Patch#11: Refer the SD Host Controller Standard Specification Section 3.10 to add reset command data mechanism.
* Patch#15: Resolve merge conflicts and reduce unnecessary line breaks.
* Patch#16: Adjust the parameters used in the __sdhci_uhs2_finish_command() to match changes in the Patch#7.
* Patch#21: Adjust gl9755_vendor_init() to the correct function.
* Patch#22: Add gl9767 to support uhs2 function.
Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
----------------- original cover letter from v14 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.
About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.
2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).
3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.
Patch structure
===============
patch#1-#7: for core
patch#8-#20: for sdhci
patch#21: for GL9755
Changes in v14 (January. 23, 2024)
* rebased to the linux-kernel-v6.7.0-rc4 in Ulf Hansson next branch.
* according to the comments provided by Adrian Hunter to modify the patches base on the [V13 00/21] Add support UHS-II for GL9755.
* Patch#03: Move mmc_card_uhs2() to include/linux/mmc/host.h, so that mmc_card_uhs2() can be available for host drivers.
* Patch#10: Use mmc_card_uhs2() to stead sdhci_uhs2_mode() in the
sdhci_uhs2_dump_regs().
* Patch#11: Since mmc_card_uhs2() is the same as sdhci_uhs2_mode(), so drop sdhci_uhs2_mode() and use mmc_card_uhs2() instead of sdhci_uhs2_mode().
* Patch#13: Use mmc_card_uhs2() to stead sdhci_uhs2_mode() in the
sdhci_uhs2_set_timeout().
* Patch#14: Use mmc_card_uhs2() to stead sdhci_uhs2_mode() in the
sdhci_uhs2_set_ios().
* Patch#16: Use mmc_card_uhs2() to stead sdhci_uhs2_mode() in the
sdhci_uhs2_request().* Patch#17: Use mmc_card_uhs2() to stead sdhci_uhs2_mode() in the sdhci_uhs2_complete_work(), sdhci_uhs2_irq() and sdhci_uhs2_thread_irq().
* Patch#18: Use mmc_card_uhs2() to stead sdhci_uhs2_mode() in the
__sdhci_uhs2_remove_host().
Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
----------------- original cover letter from v13 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.
About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.
2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).
3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.
Patch structure
===============
patch#1-#7: for core
patch#8-#20: for sdhci
patch#21: for GL9755
Changes in v13 (November. 17, 2023)
* rebased to the linux-kernel-v6.7.0-rc1 in Ulf Hansson next branch.
* according to the comments provided by Adrian Hunter to modify the
patches base on the [V12 00/23] Add support UHS-II for GL9755.
* according to the comments provided by Ulf Hansson to modify the
patches base on the [V12 00/23] Add support UHS-II for GL9755.
* Add new patch#6 to re-factoring the code.
* Patch#7: Separate __mmc_go_idle() into one patch for re-factorring the code. Move mmc_decode_scr declaration to sd.h.
Ues uhs2_sd_tran to stead MMC_UHS2_SD_TRAN.
Drop unnecessary comment.
* Patch#11: Use ios timing to stead MMC_UHS2_SUPPORT for indicate the UHS2 mode.
* Patch#12: Drop use vmmc2.
Modify comment message.
* Patch#13: Modify comment message.
* Patch#14: Add judgment condition for power mode in the __sdhci_uhs2_set_ios(). Modify comment message.
* Patch#15: Merge Patch#15, Patch#16 and Patch#17 of v12 version into Patch#15 in v13 version. Use definitions to simplify code.
Modify comment message.
* Patch#16: Re-order function to avoid declaration.
Remove unnecessary function.
* Patch#17: Re-order function to avoid declaration.
Remove unnecessary definitions.
* Patch#18: Re-order function to avoid declaration.
Use vqmmc2 to stead vmmc2.
* Patch#21: Ues uhs2_sd_tran to stead MMC_UHS2_SD_TRAN.
Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
----------------- original cover letter from v12 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.
About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.
2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).
3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.
Patch structure
===============
patch#1-#6: for core
patch#7-#22: for sdhci
patch#23: for GL9755
Changes in v12 (September. 15, 2023)
* rebased to the linux-kernel-v6.6.0-rc1 in Ulf Hansson next branch.
* according to the comments provided by Adrian Hunter to modify the patches base on the [V11 00/23] Add support UHS-II for GL9755.
* according to the comments provided by Ulf Hansson to modify the patches base on the [V11 00/23] Add support UHS-II for GL9755.
* Patch#5: Remove unused max_current_180_vdd2.
* Patch#6: Use mmc_op_multi() to check DCMD which supports multi read/write in mmc_uhs2_prepare_cmd().
Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
----------------- original cover letter from v11 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.
About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.
2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).
3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.
Patch structure
===============
patch#1-#6: for core
patch#7-#22: for sdhci
patch#23: for GL9755
Changes in v11 (September. 08, 2023)
* rebased to the linux-kernel-v6.5.0-rc5 in Ulf Hansson next branch.
* according to the comments provided by Adrian Hunter to modify the patches base on the [V10 00/23] Add support UHS-II for GL9755.
* Patch#18: Drop the check mmc_card_uhs2_hd_mode(host->mmc) in sdhci_uhs2_set_transfer_mode().
* Patch#20: Remove unused ocr_avail_uhs2.
Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
----------------- original cover letter from v10 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.
About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.
2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).
3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.
Patch structure
===============
patch#1-#6: for core
patch#7-#22: for sdhci
patch#23: for GL9755
Changes in v10 (August. 18, 2023)
* rebased to the linux-kernel-v6.5.0-rc5 in Ulf Hansson next branch.
* according to the comments provided by Ulf Hansson to modify the patches base on the [V9 00/23] Add support UHS-II for GL9755.
* Patch#2: Drop unnecessary definitions and code.
* Patch#3: Modify the commit message.
* Patch#4: Modify the commit message.
* Patch#5: Drop unnecessary definitions.
* Patch#6: Move some definitions of PatchV9[02/23] to PatchV10[06/23]. Move some definitions of PatchV9[05/23] to PatchV10[06/23]. Drop do_multi in the mmc_blk_rw_rq_prep().
Use tmode_half_duplex to instead of uhs2_tmode0_flag. Move entire control of the tmode into mmc_uhs2_prepare_cmd().
* Patch#11: Move some definitions of PatchV9[05/23] to PatchV10[11/23].
* Patch#18: Use tmode_half_duplex to instead of uhs2_tmode0_flag in sdhci_uhs2_set_transfer_mode().
* Patch#20: Move some definitions of PatchV9[05/23] to PatchV10[20/23].
Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
----------------- original cover letter from v9 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.
About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.
2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).
3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.
Patch structure
===============
patch#1-#6: for core
patch#7-#22: for sdhci
patch#23: for GL9755
Changes in v9 (July. 21, 2023)
* rebased to the linux-kernel-v6.5.0-rc1 in Ulf Hansson next branch.
* according to the comments provided by Adrian Hunter to modify the patches base on the [V8 00/23] Add support UHS-II for GL9755.
* Patch#2: move sd_uhs2_operation definition of PatchV8[05/23] to PatchV9[02/23] for avoid compilation errors.
move uhs2_control definition of PatchV8[05/23]
to PatchV9[02/23] for avoid compilation errors.
move mmc_host flags definition of PatchV8[05/23]
to PatchV9[02/23] for avoid compilation errors.
move mmc_host flags MMC_UHS2_SUPPORT definition of PatchV8[05/23] to PatchV9[02/23] for avoid compilation errors. move mmc_host flags MMC_UHS2_SD_TRAN definition of PatchV8[05/23] to PatchV9[02/23] for avoid compilation errors.
* Patch#7: Modify the commit message.
* Patch#8: Modify the commit message.
* Patch#11: Modify annotations in sdhci_get_vdd_value().
* Patch#14: Simplity the turning_on_clk in sdhci_set_ios().
* Patch#18: Modify the annotations in __sdhci_uhs2_send_command().
* Patch#19: Cancel export state of sdhci_set_mrq_done() function.
* Patch#23: Rename gl9755_pre_detect_init() to sdhci_gli_pre_detect_init().
Rename gl9755_uhs2_reset_sd_tran() to
sdhci_gli_uhs2_reset_sd_tran().Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
----------------- original cover letter from v8 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.
About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.
2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).
3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.
Patch structure
===============
patch#1-#6: for core
patch#7-#22: for sdhci
patch#23: for GL9755
Changes in v8 (June. 21, 2023)
* rebased to the linux-kernel-v6.4.0-rc6 in Ulf Hansson next branch.
* fix most of checkpatch warnings/errors.
* according to the comments provided by Adrian Hunter to modify the patches base on the [V7 00/23] Add support UHS-II for GL9755.
* Patch#6: Add MMC_UHS2_SUPPORT to be cleared in sd_uhs2_detect(). Modify return value in sd_uhs2_attach().
* Patch#7: Use tabs instead of spaces.
* Patch#8: Modify MODULE_LICENSE from "GPL v2" to "GPL".
* Patch#10: Adjust the position of matching brackets.
* Patch#11: Adjust the position of matching brackets.
Add the initial value of the pwr in sdhci_uhs2_set_power().
* Patch#13: Initialization be combined with declaration and realigned in sdhci_calc_timeout_uhs2().
Forward declare struct mmc_command in sdhci_uhs2.h.
* Patch#14: Add the judgment formula for MMC_TIMING_SPEED_A_HD, MMC_TIMING_SPEED_B and MMC_TIMING_SPEED_B_HD in __sdhci_uhs2_set_ios().
Add the switch case for MMC_TIMING_SPEED_A_HD, MMC_TIMING_SPEED_B and MMC_TIMING_SPEED_B_HD in sdhci_get_preset_value(). mmc_opt_regulator_set_ocr() to instead of mmc_regulator_set_ocr() in sdhci_uhs2_set_ios().
* Patch#15: usleep_range() to instead of udelay() in sdhci_uhs2_interface_detect(). read_poll_timeout() to instead of read_poll_timeout_atomic() in sdhci_uhs2_interface_detect().
Modify return value in sdhci_uhs2_do_detect_init().
* Patch#16: Remove unnecessary include file. read_poll_timeout() to instead of read_poll_timeout_atomic() in sdhci_uhs2_enable_clk().
Put the comment on the end and put the lines in descending line length in sdhci_uhs2_enable_clk().
Modify return value in sdhci_uhs2_enable_clk().
* Patch#17: Reorder the definitions and lose the parentheses in sdhci_uhs2_set_config().
read_poll_timeout() to instead of read_poll_timeout_atomic() in sdhci_uhs2_check_dormant().
* Patch#18: Adjust the position of matching brackets in sdhci_uhs2_send_command_retry().
Modify CameCase definition in __sdhci_uhs2_finish_command(). Modify error message in __sdhci_uhs2_finish_command(). sdhci_uhs2_send_command_retry() to instead of sdhci_uhs2_send_command() in sdhci_uhs2_request(). Use sdhci_uhs2_mode() to simplify code in sdhci_uhs2_request_atomic().
Add forward declaration for sdhci_send_command().
* Patch#19: Forward declare struct mmc_request in sdhci_uhs2.h. Remove forward declaration of sdhci_send_command(). Use mmc_dev() to simplify code in sdhci_request_done_dma().
* Patch#20: Change return type to void for __sdhci_uhs2_add_host_v4(). Remove unused variables in __sdhci_uhs2_add_host_v4().
* Patch#22: Add config select MMC_SDHCI_UHS2 in Kconfig.
* Patch#23: Use sdhci_get_vdd_value() to simplify code in gl9755_set_power().
Use read_poll_timeout_atomic() to simplify code in sdhci_wait_clock_stable().
Use read_poll_timeout_atomic() to simplify code in sdhci_gl9755_reset().
Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
----------------- original cover letter from v7 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.
About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence [2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence[2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.
2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).
3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.
Patch structure
===============
patch#1-#6: for core
patch#7-#22: for sdhci
patch#23: for GL9755
Changes in v7 (Mar. 31, 2023)
* rebased to the linux-kernel-v6.3.0-rc3 in Ulf Hansson next branch.
* according to the guidance and overall architecture provided by Ulf Hansson, Ben Chuang and Jason Lai to implement the UHS-2 Core function based on the patches of the [V4,0/6] Preparations to support SD UHS-II cards[5].
* according to the guidance and comments provided by Adrian Hunter, Ben Chuang and AKASHI Takahiro to implement the UHS-2 Host function based on the patches of the [RFC,v3.1,00/27] Add support UHS-II for GL9755[4].
* implement the necessary function to let the UHS-2 Core/Host work properly.
* fix most of checkpatch warnings/errors.
* according to the guidance and comments provided by Adrian Hunter, Ben Chuang to implement the UHS-2
Host function based on the patches of the
[V5,00/26] Add support UHS-II for GL9755[6].
* according to the guidance and comments provided by
Ulf Hanssion, Adrian Hunter, Ben Chuang to implement the UHS-2 Host function based on the patches of the
[V6,00/24] Add support UHS-II for GL9755[7].
* The uhs2_post_attach_sd() function is no longer needed so drop the V6 version of the Patch#22.
* Modifies the usage of the flags used by the sdhci host for MMC_UHS2_INITIALIZED.
* Patch#1: Drop unnecessary bracket.
* Patch#2: Drop sd_uhs2_set_ios function.
Used ->uhs2_control() callback for uhs2_set_ios
in sd_uhs2_power_up().
Used ->uhs2_control() callback for uhs2_set_ios
in sd_uhs2_power_off().
Drop MMC_TIMING_SD_UHS2 in favor of MMC_TIMING_UHS2_SPEED_A.
Modify sd_uhs2_legacy_init to avoid the
sd_uhs2_reinit cycle issue.
* Patch#5: Drop unnecessary definitions.
* Patch#6: Drop unnecessary function.
Drop uhs2_state in favor of ios->timing.* Patch#7: Reorder values and positions of definitions.
* Patch#9: Used sdhci_uhs2_mode function to simplify.
* Patch#11: Drop pwr variable in sdhci_uhs2_set_power function.
* Patch#14: Modify some descriptions.
Drop unnecessary function.
* Patch#15: Drop using uhs2_reset ops and use sdhci_uhs2_reset function in the sdhci_do_detect_init function.
* Patch#17: Drop unnecessary function.
* Patch#18: Drop unnecessary whitespace changes.
Cancel the export state of some functions.
* Patch#19: Drop unnecessary function.
Used sdhci_uhs2_mode function to simplify. Modify some descriptions.
Cancel the export state of some functions.
* Patch#20: Drop using __sdhci_uhs2_host function and use __sdhci_add_host function in sdhci_uhs2_add_host function. Cancel the export state of some functions.
* Patch#23: Drop using uhs2_post_attach_sd function.
Reference
=========
[1] https://gitlab.com/ben.chuang/linux-uhs2-gl9755.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
[5] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
[6] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
[7] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
----------------- original cover letter from v6 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.
About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence [2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence[2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.
2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).
3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.
Patch structure
===============
patch#1-#6: for core
patch#7-#23: for sdhci
patch#24: for GL9755
Changes in v6 (Dec. 12, 2022)
* rebased to the linux-kernel-v6.1.0-rc8 in Ulf Hansson next branch.
* according to the guidance and overall architecture provided by Ulf Hansson, Ben Chuang and Jason Lai to implement the UHS-2 Core function based on the patches of the [V4,0/6] Preparations to support SD UHS-II cards[5].
* according to the guidance and comments provided by Adrian Hunter, Ben Chuang and AKASHI Takahiro to implement the UHS-2 Host function based on the patches of the [RFC,v3.1,00/27] Add support UHS-II for GL9755[4].
* implement the necessary function to let the UHS-2 Core/Host work properly.
* fix most of checkpatch warnings/errors.
* according to the guidance and comments provided by Adrian Hunter, Ben Chuang to implement the UHS-2
Host function based on the patches of the
[V5,00/26] Add support UHS-II for GL9755[6].
* The uhs2_post_attach_sd() has implemented in Patch#6 and Patch#17 so drop the V5 version of the Patch#23.
* Modifies the usage of the flags used by the sdhci host for MMC_UHS2_INITIALIZED.
* Patch#5: Drop unused definitions and functions.
* Patch#7: Rename definitions.
Use BIT() GENMASK() in some cases.
* Patch#8: Merge V5 version of Patch[7] and Patch[9] into V6 version of Patch[8].
* Patch#9: Drop unnecessary function.
Rename used definitions.
* Patch#10: Drop unnecessary function and simplify some code.
* Patch#11: Drop unnecessary function.
Add new mmc_opt_regulator_set_ocr function.
* Patch#13: Drop unnecessary function.
Use GENMASK() and FIELD_PREP() in some cases.
* Patch#14: Drop unnecessary function.
Modify return value in some function.
Use GENMASK() and FIELD_PREP() in some cases.
* Patch#15: Drop unnecessary function.
Rename used definitions.
Use GENMASK() and FIELD_GET() in some cases. Wrap at 100 columns in some functions.
* Patch#16: Drop unnecessary function.
* Patch#17: Drop unnecessary function.
Drop the unnecessary parameter when call the DBG() function.
Rename used definitions.
Cancel the export state of some functions. Use GENMASK() and FIELD_PREP() in some cases.
* Patch#18: Drop unnecessary function.
Add uhs2_dev_cmd function to simplify some functions. Rename used definitions.
Cancel the export state of some functions. Use GENMASK() and FIELD_PREP() in some cases.
* Patch#19: Drop unnecessary function.
Add sdhci_uhs2_mode() in some functions. Rename used definitions.
Cancel the export state of some functions.
* Patch#20: Add new complete_work_fn/thread_irq_fn variables in struct sdhci_host.
Use complete_work_fn/thread_irq_fn variables in sdhci_alloc_host()/sdhci_uhs2_add_host(). Rename used definitions.
* Patch[24]: Rename used definitions.
Reference
=========
[1] https://gitlab.com/ben.chuang/linux-uhs2-gl9755.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
[5] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
[6] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
----------------- original cover letter from v5 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.
About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence [2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence[2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.
2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).
3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.
Patch structure
===============
patch#1-#6: for core
patch#7-#25: for sdhci
patch#26: for GL9755
Changes in v5 (Oct. 19, 2022)
* rebased to the linux-kernel-v6.1-rc1 in Ulf Hansson next branch.
* according to the guidance and overall architecture provided by Ulf Hansson, Ben Chuang and Jason Lai to implement the UHS-2 Core function based on the patches of the [V4,0/6] Preparations to support SD UHS-II cards[5].
* according to the guidance and comments provided by Adrian Hunter, Ben Chuang and AKASHI Takahiro to implement the UHS-2 Host function based on the patches of the [RFC,v3.1,00/27] Add support UHS-II for GL9755[4].
* implement the necessary function to let the UHS-2 Core/Host work properly.
* fix most of checkpatch warnings/errors
Reference
=========
[1] https://gitlab.com/ben.chuang/linux-uhs2-gl9755.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
[5] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
----------------- original cover letter from v3.1 ----------------- This is an interim snapshot of our next version, v4, for enabling UHS-II on MMC/SD.
It is focused on 'sdhci' side to address Adrian's comments regarding "modularising" sdhci-uhs2.c.
The whole aim of this version is to get early feedback from Adrian (and others) on this issue. Without any consensus about the code structure, it would make little sense to go further ahead on sdhci side. (Actually, Adrian has made no comments other than "modularising" so far.)
I heavily reworked/refactored sdhci-uhs2.c and re-organised the patch set to meet what I believe Adrian expects; no UHS-II related code in Legacy (UHS-I) code or sdhci.c.
Nevertheless, almost of all changes I made are trivial and straightforward in this direction, and I believe that there is no logic changed since v3 except sdhci_uhs2_irq(), as ops->irq hook, where we must deal with UHS-II command sequences in addition to UHS-II errors. So I added extra handlings.
I admit that there is plenty of room for improvements (for example, handling host->flags), but again the focal point here is how sdhci-uhs2.c should be built as a module.
Please review this series (particularly Patch#8-#26 and #27) from this viewpoint in the first place.
(Ben is working on 'host' side but there is no change on 'host' side in this submission except a minor tweak.)
Thanks,
-Takahiro Akashi
------ original cover letter from v3 ------
Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.
About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence [2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence[2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.
2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).
3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.
Patch structure
===============
patch#1-#7: for core
patch#8-#17: for sdhci
patch#18-#21: for GL9755
Tests
=====
Ran 'dd' command to evaluate the performance:
(SanDisk UHS-II card on GL9755 controller)
Read Write
UHS-II disabled (UHS-I): 88.3MB/s 60.7MB/s
UHS-II enabled : 206MB/s 80MB/s
TODO
====
- replace some define with BIT macro
Reference
=========
[1] https://gitlab.com/ben.chuang/linux-uhs2-gl9755.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
Changes in v3 (Jul. 10, 2020)
* rebased to v5.8-rc4
* add copyright notice
* reorganize the patch set and split some commits into smaller ones
* separate uhs-2 headers from others
* correct wrong spellings
* fix most of checkpatch warnings/errors
* remove all k[cz]alloc() from the code
* guard sdhci-uhs2 specific code with
'if (IS_ENABLED(CONFIG_MMC_SDHCI_UHS2))'
* make sdhci-uhs2.c as a module
* trivial changes, including
- rename back sdhci-core.c to sdhci.c
- allow vendor code to disable uhs2 if v4_mode == 0
in __sdhci_add_host()
- merge uhs2_power_up() into mmc_power_up()
- remove flag_uhs2 from mmc_attach_sd()
- add function descriptions to EXPORT'ed functions
- other minor code optimization
Changes in v2 (Jan. 9, 2020)
* rebased to v5.5-rc5
Ben Chuang (1):
mmc: sdhci-uhs2: add pre-detect_init hook
Ulf Hansson (4):
mmc: core: Cleanup printing of speed mode at card insertion
mmc: core: Prepare to support SD UHS-II cards
mmc: core: Announce successful insertion of an SD UHS-II card
mmc: core: Extend support for mmc regulators with a vqmmc2
Victor Shih (17):
mmc: core: Add definitions for SD UHS-II cards
mmc: core: Add New function to re-factoring the code
mmc: core: Support UHS-II card control and access
mmc: sdhci: add UHS-II related definitions in headers
mmc: sdhci: add UHS-II module and add a kernel configuration
mmc: sdhci-uhs2: dump UHS-II registers
mmc: sdhci-uhs2: add reset function
mmc: sdhci-uhs2: add set_power() to support vdd2
mmc: sdhci-uhs2: add set_timeout()
mmc: sdhci-uhs2: add set_ios()
mmc: sdhci-uhs2: add uhs2_control() to initialise the interface
mmc: sdhci-uhs2: add request() and others
mmc: sdhci-uhs2: add irq() and others
mmc: sdhci-uhs2: add add_host() and others to set up the driver
mmc: sdhci-pci: add UHS-II support framework
mmc: sdhci-pci-gli: enable UHS-II mode for GL9755
mmc: sdhci-pci-gli: enable UHS-II mode for GL9767
drivers/mmc/core/Makefile | 2 +- drivers/mmc/core/bus.c | 38 +- drivers/mmc/core/core.c | 23 +- drivers/mmc/core/core.h | 1 + drivers/mmc/core/mmc_ops.c | 24 +- drivers/mmc/core/mmc_ops.h | 1 + drivers/mmc/core/regulator.c | 34 + drivers/mmc/core/sd.c | 10 +- drivers/mmc/core/sd.h | 5 + drivers/mmc/core/sd_ops.c | 9 + drivers/mmc/core/sd_ops.h | 13 + drivers/mmc/core/sd_uhs2.c | 1326 +++++++++++++++++++++++++++++ drivers/mmc/host/Kconfig | 10 + drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-pci-core.c | 16 +- drivers/mmc/host/sdhci-pci-gli.c | 439 +++++++++- drivers/mmc/host/sdhci-pci.h | 3 + drivers/mmc/host/sdhci-uhs2.c | 1273 +++++++++++++++++++++++++++ drivers/mmc/host/sdhci-uhs2.h | 190 +++++ drivers/mmc/host/sdhci.c | 281 +++--- drivers/mmc/host/sdhci.h | 75 +- include/linux/mmc/card.h | 36 + include/linux/mmc/core.h | 17 + include/linux/mmc/host.h | 80 ++ include/linux/mmc/sd_uhs2.h | 240 ++++++ 25 files changed, 3998 insertions(+), 149 deletions(-) create mode 100644 drivers/mmc/core/sd_uhs2.c create mode 100644 drivers/mmc/host/sdhci-uhs2.c create mode 100644 drivers/mmc/host/sdhci-uhs2.h create mode 100644 include/linux/mmc/sd_uhs2.h
Signature · 1 line
2.25.1
PATCH v20 1/22 mmc: core: Cleanup printing of speed mode at card insertion
From: Ulf Hansson <[email protected]>
The current print of the bus speed mode in mmc_add_card() has grown over the years and is now difficult to parse. Let's clean up the code and also take the opportunity to properly announce "DDR" for eMMCs as "high speed DDR", which is according to the eMMC spec.
--- drivers/mmc/core/bus.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-)
drivers/mmc/core/bus.c +20 -16
@@ -299,6 +299,7 @@ int mmc_add_card(struct mmc_card *card) {int ret;const char *type; +const char *speed_mode ="" ;const char *uhs_bus_speed_mode ="" ;static const char *const uhs_speeds[] = { [UHS_SDR12_BUS_SPEED ] ="SDR12 " ,
@@ -340,27 +341,30 @@ int mmc_add_card(struct mmc_card *card)break ; } +if (mmc_card_hs (card)) + speed_mode ="high speed " ; +else if (mmc_card_uhs (card)) + speed_mode ="ultra high speed " ; +else if (mmc_card_ddr52 (card)) + speed_mode ="high speed DDR " ; +else if (mmc_card_hs200 (card)) + speed_mode ="HS200 " ; +else if (mmc_card_hs400es (card)) + speed_mode ="HS400 Enhanced strobe " ; +else if (mmc_card_hs400 (card)) + speed_mode ="HS400 " ; +if (mmc_card_uhs (card) && (card->sd_bus_speed <ARRAY_SIZE (uhs_speeds))) uhs_bus_speed_mode = uhs_speeds[card->sd_bus_speed]; -if (mmc_host_is_spi (card->host)) { -pr_info ("%s: new %s%s%s card on SPI\n" , -mmc_hostname (card->host), -mmc_card_hs (card) ?"high speed " :"" , -mmc_card_ddr52 (card) ?"DDR " :"" , - type); - }else { -pr_info ("%s: new %s%s%s%s%s%s card at address %04x\n" , -mmc_hostname (card->host), -mmc_card_uhs (card) ?"ultra high speed " : - (mmc_card_hs (card) ?"high speed " :"" ), -mmc_card_hs400 (card) ?"HS400 " : - (mmc_card_hs200 (card) ?"HS200 " :"" ), -mmc_card_hs400es (card) ?"Enhanced strobe " :"" , -mmc_card_ddr52 (card) ?"DDR " :"" , +if (mmc_host_is_spi (card->host)) +pr_info ("%s: new %s%s card on SPI\n" , +mmc_hostname (card->host), speed_mode, type); +else +pr_info ("%s: new %s%s%s card at address %04x\n" , +mmc_hostname (card->host), speed_mode, uhs_bus_speed_mode, type, card->rca); - }mmc_add_card_debugfs (card); card->dev.of_node =mmc_of_find_child_device (card->host,0 );
Signature · 1 line
2.25.1
PATCH v20 2/22 mmc: core: Prepare to support SD UHS-II cards
In reply to Victor ShihFrom: Ulf Hansson <[email protected]>
The SD UHS-II interface was introduced to the SD spec v4.00 several years ago. The interface is fundamentally different from an electrical and a protocol point of view, comparing to the legacy SD interface.
However, the legacy SD protocol is supported through a specific transport layer (SD-TRAN) defined in the UHS-II addendum of the spec. This allows the SD card to be managed in a very similar way as a legacy SD card, hence a lot of code can be re-used to support these new types of cards through the mmc subsystem.
Moreover, an SD card that supports the UHS-II interface shall also be backwards compatible with the legacy SD interface, which allows a UHS-II card to be inserted into a legacy slot. As a matter of fact, this is already supported by mmc subsystem as of today.
To prepare to add support for UHS-II, this change puts the basic foundation in the mmc core in place, allowing it to be more easily reviewed before subsequent changes implements the actual support.
Basically, the approach here adds a new UHS-II bus_ops type and adds a separate initialization path for the UHS-II card. The intent is to avoid us from sprinkling the legacy initialization path, but also to simplify implementation of the UHS-II specific bits.
At this point, there is only one new host ops added to manage the various ios settings needed for UHS-II. Additional host ops that are needed, are being added from subsequent changes.
---
Updates in V10:
- Drop unnecessary definitions and code.
Updates in V9:
- move sd_uhs2_operation definition of PatchV8[05/23] to PatchV9[02/23] for avoid compilation errors.
- move uhs2_control definition of PatchV8[05/23] to PatchV9[02/23] for avoid compilation errors.
- move mmc_host flags definition of PatchV8[05/23] to PatchV9[02/23] for avoid compilation errors.
- move mmc_host flags MMC_UHS2_SUPPORT definition of PatchV8[05/23] to PatchV9[02/23] for avoid compilation errors.
- move mmc_host flags MMC_UHS2_SD_TRAN definition of PatchV8[05/23] to PatchV9[02/23] for avoid compilation errors.
Updates in V7:
- Drop sd_uhs2_set_ios function.
- Used ->uhs2_control() callback for uhs2_set_ios in sd_uhs2_power_up().
- Used ->uhs2_control() callback for uhs2_set_ios in sd_uhs2_power_off().
- Drop MMC_TIMING_SD_UHS2 in favor of MMC_TIMING_UHS2_SPEED_A.
- Modify sd_uhs2_legacy_init to avoid sd_uhs2_reinit cycle issue.
Updates in V4:
- Re-based, updated a comment and removed white-space.
- Moved MMC_VQMMC2_VOLTAGE_180 into a later patch in the series.
---
drivers/mmc/core/Makefile | 2 +- drivers/mmc/core/core.c | 17 ++- drivers/mmc/core/core.h | 1 + drivers/mmc/core/sd_uhs2.c | 292 +++++++++++++++++++++++++++++++++++++ include/linux/mmc/card.h | 7 + include/linux/mmc/host.h | 23 +++ 6 files changed, 340 insertions(+), 2 deletions(-) create mode 100644 drivers/mmc/core/sd_uhs2.c
drivers/mmc/core/Makefile +1 -1
@@ -7,7 +7,7 @@ obj-$(CONFIG_MMC) += mmc_core.o mmc_core-y := core.o bus.o host.o \ mmc.o mmc_ops.o sd.o sd_ops.o \ sdio.o sdio_ops.o sdio_bus.o \ - sdio_cis.o sdio_io.o sdio_irq.o \ + sdio_cis.o sdio_io.o sdio_irq.o sd_uhs2.o\ slot-gpio.o regulator.o mmc_core-$(CONFIG_OF) += pwrseq.o obj-$(CONFIG_PWRSEQ_SIMPLE) += pwrseq_simple.o
drivers/mmc/core/core.c +16 -1
@@ -2249,6 +2249,18 @@ void mmc_rescan(struct work_struct *work) goto out; } +/* +* Ideally we should favor initialization of legacy SD cards and defer +* UHS-II enumeration. However, it seems like cards doesn't reliably +* announce their support for UHS-II in the response to the ACMD41, +* while initializing the legacy SD interface. Therefore, let's start +* with UHS-II for now. +*/ +if (!mmc_attach_sd_uhs2 (host)) { +mmc_release_host (host); + goto out; + } +for (i =0 ; i <ARRAY_SIZE (freqs); i++) {unsigned int freq = freqs[i];if (freq > host->f_max) {
@@ -2281,10 +2293,13 @@ void mmc_rescan(struct work_struct *work)void mmc_start_host (struct mmc_host *host) { +bool power_up = !(host->caps2 & + (MMC_CAP2_NO_PRESCAN_POWERUP |MMC_CAP2_SD_UHS2 )); + host->f_init =max (min (freqs[0 ], host->f_max), host->f_min); host->rescan_disable =0 ; -if (!(host->caps2 &MMC_CAP2_NO_PRESCAN_POWERUP )) { +if (power_up) {mmc_claim_host (host);mmc_power_up (host, host->ocr_avail);mmc_release_host (host);
drivers/mmc/core/core.h +1 -0
@@ -81,6 +81,7 @@ int mmc_detect_card_removed(struct mmc_host *host);int mmc_attach_mmc (struct mmc_host *host);int mmc_attach_sd (struct mmc_host *host);int mmc_attach_sdio (struct mmc_host *host); +int mmc_attach_sd_uhs2 (struct mmc_host *host);/* Module parameters */ extern bool use_spi_crc;
drivers/mmc/core/sd_uhs2.c new file +292 -0
292 lines not on this page · raw message
include/linux/mmc/card.h +7 -0
@@ -209,6 +209,11 @@ struct sd_ext_reg {#define SD_EXT_PERF_CMD_QUEUE (1<<4) }; +struct sd_uhs2_config { +u32 node_id; +/* TODO: Extend with more register configs. */ +}; +struct sdio_cccr {unsigned int sdio_vsn;unsigned int sd_vsn;
@@ -319,6 +324,8 @@ struct mmc_card {struct sd_ext_reg ext_power;/* SD extension reg for PM */ struct sd_ext_reg ext_perf;/* SD extension reg for PERF */ +struct sd_uhs2_config uhs2_config;/* SD UHS-II config */ +unsigned int sdio_funcs;/* number of SDIO functions */ atomic_t sdio_funcs_probed;/* number of probed SDIO funcs */ struct sdio_cccr cccr;/* common card info */
include/linux/mmc/host.h +23 -0
@@ -63,6 +63,10 @@ struct mmc_ios {#define MMC_TIMING_MMC_HS400 10#define MMC_TIMING_SD_EXP 11#define MMC_TIMING_SD_EXP_1_2V 12 +#define MMC_TIMING_UHS2_SPEED_A 13 +#define MMC_TIMING_UHS2_SPEED_A_HD 14 +#define MMC_TIMING_UHS2_SPEED_B 15 +#define MMC_TIMING_UHS2_SPEED_B_HD 16unsigned char signal_voltage;/* signalling voltage (1.8V or 3.3V) */
@@ -91,6 +95,14 @@ struct mmc_clk_phase_map {struct mmc_clk_phase phase[MMC_NUM_CLK_PHASES ]; }; +struct sd_uhs2_caps { +/* TODO: Add UHS-II capabilities for the host. */ +}; + +enum sd_uhs2_operation { +UHS2_SET_IOS , +}; +struct mmc_host ;enum mmc_err_stat {
@@ -218,6 +230,14 @@ struct mmc_host_ops {/* Initialize an SD express card, mandatory for MMC_CAP2_SD_EXP. */ int (*init_sd_express)(struct mmc_host *host,struct mmc_ios *ios); + +/* +* The uhs2_control callback is used to execute SD UHS-II specific +* operations. It's mandatory to implement for hosts that supports the +* SD UHS-II interface (MMC_CAP2_SD_UHS2). Expected return values are a +* negative errno in case of a failure or zero for success. +*/ +int (*uhs2_control)(struct mmc_host *host,enum sd_uhs2_operation op); };struct mmc_cqe_ops {
@@ -378,6 +398,7 @@ struct mmc_host { MMC_CAP2_HS200_1_2V_SDR)#define MMC_CAP2_SD_EXP (1 << 7)/* SD express via PCIe */ #define MMC_CAP2_SD_EXP_1_2V (1 << 8)/* SD express 1.2V */ +#define MMC_CAP2_SD_UHS2 (1 << 9)/* SD UHS-II support */ #define MMC_CAP2_CD_ACTIVE_HIGH (1 << 10)/* Card-detect signal active high */ #define MMC_CAP2_RO_ACTIVE_HIGH (1 << 11)/* Write-protect signal active high */ #define MMC_CAP2_NO_PRESCAN_POWERUP (1 << 14)/* Don't power up before scan */
@@ -404,6 +425,8 @@ struct mmc_host {#endif #define MMC_CAP2_ALT_GPT_TEGRA (1 << 28)/* Host with eMMC that has GPT entry at a non-standard location */ +struct sd_uhs2_caps uhs2_caps;/* Host UHS-II capabilities */ +int fixed_drv_type;/* fixed driver type for non-removable media */ mmc_pm_flag_t pm_caps;/* supported pm features */
Signature · 1 line
2.25.1
PATCH v20 3/22 mmc: core: Announce successful insertion of an SD UHS-II card
In reply to Victor ShihFrom: Ulf Hansson <[email protected]>
To inform the users about SD UHS-II cards, let's extend the print at card insertion with a "UHS-II" substring. Within this change, it seems reasonable to convert from using "ultra high speed" into "UHS-I speed", for the UHS-I type, as it should makes it more clear.
Note that, the new print for UHS-II cards doesn't include the actual selected speed mode. Instead, this is going to be added from subsequent change.
---
Updates in V14:
- Move mmc_card_uhs2() to include/linux/mmc/host.h, so that mmc_card_uhs2() can be available for host drivers.
Updates in V10:
- Modify the commit message.
Updates in V7:
- Drop MMC_TIMING_SD_UHS2 in favor of MMC_TIMING_UHS2_SPEED_A in mmc_card_uhs2 function.
Updates in V4:
- Make mmc_card_uhs2() take struct mmc_host* as in-param.
---
drivers/mmc/core/bus.c | 4 +++- include/linux/mmc/host.h | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/mmc/core/bus.c +3 -1
@@ -344,7 +344,9 @@ int mmc_add_card(struct mmc_card *card)if (mmc_card_hs (card)) speed_mode ="high speed " ;else if (mmc_card_uhs (card)) - speed_mode ="ultra high speed " ; + speed_mode ="UHS-I speed " ; +else if (mmc_card_uhs2 (card->host)) + speed_mode ="UHS-II speed " ;else if (mmc_card_ddr52 (card)) speed_mode ="high speed DDR " ;else if (mmc_card_hs200 (card))
include/linux/mmc/host.h +8 -0
@@ -637,6 +637,14 @@ static inline int mmc_card_uhs(struct mmc_card *card) card->host->ios.timing <=MMC_TIMING_UHS_DDR50 ; } +static inline bool mmc_card_uhs2 (struct mmc_host *host) +{ +return host->ios.timing ==MMC_TIMING_UHS2_SPEED_A || + host->ios.timing ==MMC_TIMING_UHS2_SPEED_A_HD || + host->ios.timing ==MMC_TIMING_UHS2_SPEED_B || + host->ios.timing ==MMC_TIMING_UHS2_SPEED_B_HD ; +} +void mmc_retune_timer_stop (struct mmc_host *host);static inline void mmc_retune_needed (struct mmc_host *host)
Signature · 1 line
2.25.1
PATCH v20 4/22 mmc: core: Extend support for mmc regulators with a vqmmc2
In reply to Victor ShihFrom: Ulf Hansson <[email protected]>
To allow an additional external regulator to be controlled by an mmc host driver, let's add support for a vqmmc2 regulator to the mmc core.
For an SD UHS-II interface the vqmmc2 regulator may correspond to the so called vdd2 supply, as described by the SD spec. Initially, only 1.8V is needed, hence limit the new helper function, mmc_regulator_set_vqmmc2() to this too.
Note that, to allow for flexibility mmc host drivers need to manage the enable/disable of the vqmmc2 regulator themselves, while the regulator is looked up through the common mmc_regulator_get_supply().
---
Updates in V10:
- Modify the commit message.
Updates in V4:
- Moved the voltage defines into this patch.
---
drivers/mmc/core/regulator.c | 34 ++++++++++++++++++++++++++++++++++ include/linux/mmc/host.h | 11 +++++++++++ 2 files changed, 45 insertions(+)
drivers/mmc/core/regulator.c +34 -0
@@ -226,6 +226,33 @@ int mmc_regulator_set_vqmmc(struct mmc_host *mmc, struct mmc_ios *ios) }EXPORT_SYMBOL_GPL (mmc_regulator_set_vqmmc); +/** +* mmc_regulator_set_vqmmc2 - Set vqmmc2 as per the ios->vqmmc2_voltage +* @mmc: The mmc host to regulate +* @ios: The io bus settings +* +* Sets a new voltage level for the vqmmc2 regulator, which may correspond to +* the vdd2 regulator for an SD UHS-II interface. This function is expected to +* be called by mmc host drivers. +* +* Returns a negative error code on failure, zero if the voltage level was +* changed successfully or a positive value if the level didn't need to change. +*/ +int mmc_regulator_set_vqmmc2 (struct mmc_host *mmc,struct mmc_ios *ios) +{ +if (IS_ERR (mmc->supply.vqmmc2)) +return -EINVAL ; + +switch (ios->vqmmc2_voltage) { +case MMC_VQMMC2_VOLTAGE_180 : +return mmc_regulator_set_voltage_if_supported ( + mmc->supply.vqmmc2,1700000 ,1800000 ,1950000 ); +default : +return -EINVAL ; + } +} +EXPORT_SYMBOL_GPL (mmc_regulator_set_vqmmc2); +#else static inline int mmc_regulator_get_ocrmask (struct regulator *supply)
@@ -252,6 +279,7 @@ int mmc_regulator_get_supply(struct mmc_host *mmc) mmc->supply.vmmc =devm_regulator_get_optional (dev,"vmmc" ); mmc->supply.vqmmc =devm_regulator_get_optional (dev,"vqmmc" ); + mmc->supply.vqmmc2 =devm_regulator_get_optional (dev,"vqmmc2" );if (IS_ERR (mmc->supply.vmmc)) {if (PTR_ERR (mmc->supply.vmmc) == -EPROBE_DEFER )
@@ -271,6 +299,12 @@ int mmc_regulator_get_supply(struct mmc_host *mmc)dev_dbg (dev,"No vqmmc regulator found\n" ); } +if (IS_ERR (mmc->supply.vqmmc2)) { +if (PTR_ERR (mmc->supply.vqmmc2) == -EPROBE_DEFER ) +return -EPROBE_DEFER ; +dev_dbg (dev,"No vqmmc2 regulator found\n" ); + } +return 0 ; }EXPORT_SYMBOL_GPL (mmc_regulator_get_supply);
include/linux/mmc/host.h +11 -0
@@ -74,6 +74,9 @@ struct mmc_ios {#define MMC_SIGNAL_VOLTAGE_180 1#define MMC_SIGNAL_VOLTAGE_120 2 +unsigned char vqmmc2_voltage; +#define MMC_VQMMC2_VOLTAGE_180 0 +unsigned char drv_type;/* driver type (A, B, C, D) */ #define MMC_SET_DRIVER_TYPE_B 0
@@ -307,6 +310,7 @@ struct mmc_pwrseq;struct mmc_supply {struct regulator *vmmc;/* Card power supply */ struct regulator *vqmmc;/* Optional Vccq supply */ +struct regulator *vqmmc2;/* Optional supply for phy */ };struct mmc_ctx {
@@ -589,6 +593,7 @@ int mmc_regulator_set_ocr(struct mmc_host *mmc,struct regulator *supply, unsigned short vdd_bit);int mmc_regulator_set_vqmmc (struct mmc_host *mmc,struct mmc_ios *ios); +int mmc_regulator_set_vqmmc2 (struct mmc_host *mmc,struct mmc_ios *ios);#else static inline int mmc_regulator_set_ocr(struct mmc_host *mmc, struct regulator *supply,
@@ -602,6 +607,12 @@ static inline int mmc_regulator_set_vqmmc(struct mmc_host *mmc, {return -EINVAL ; } + +static inline int mmc_regulator_set_vqmmc2 (struct mmc_host *mmc, +struct mmc_ios *ios) +{ +return -EINVAL ; +}#endif int mmc_regulator_get_supply (struct mmc_host *mmc);
Signature · 1 line
2.25.1
PATCH v20 5/22 mmc: core: Add definitions for SD UHS-II cards
In reply to Victor ShihFrom: Victor Shih <[email protected]>
Add UHS-II specific data structures for commands and defines for registers, as described in Part 1 UHS-II Addendum Version 1.01.
UHS-II related definitions are listed below:
1. UHS-II card capability: sd_uhs2_caps{}
2. UHS-II configuration: sd_uhs2_config{}
3. UHS-II register I/O address and register field definitions: sd_uhs2.h
---
Updates in V12:
- Remove unused max_current_180_vdd2.
Updates in V10:
- Drop unnecessary definitions.
Updates in V7:
- Remove unnecessary definitions.
Updates in V6:
- Remove unnecessary definitions and functions.
---
include/linux/mmc/card.h | 31 ++++- include/linux/mmc/host.h | 25 +++- include/linux/mmc/sd_uhs2.h | 240 ++++++++++++++++++++++++++++++++++++ 3 files changed, 294 insertions(+), 2 deletions(-) create mode 100644 include/linux/mmc/sd_uhs2.h
include/linux/mmc/card.h +30 -1
@@ -188,6 +188,12 @@ struct sd_switch_caps {#define SD_MAX_CURRENT_400 (1 << SD_SET_CURRENT_LIMIT_400)#define SD_MAX_CURRENT_600 (1 << SD_SET_CURRENT_LIMIT_600)#define SD_MAX_CURRENT_800 (1 << SD_SET_CURRENT_LIMIT_800) + +#define SD4_SET_POWER_LIMIT_0_72W 0 +#define SD4_SET_POWER_LIMIT_1_44W 1 +#define SD4_SET_POWER_LIMIT_2_16W 2 +#define SD4_SET_POWER_LIMIT_2_88W 3 +#define SD4_SET_POWER_LIMIT_1_80W 4 };struct sd_ext_reg {
@@ -211,7 +217,30 @@ struct sd_ext_reg {struct sd_uhs2_config {u32 node_id; -/* TODO: Extend with more register configs. */ + +u32 n_fcu; +u32 maxblk_len; +u8 n_lanes; +u8 dadr_len; +u8 app_type; +u8 phy_minor_rev; +u8 phy_major_rev; +u8 can_hibernate; +u8 n_lss_sync; +u8 n_lss_dir; +u8 link_minor_rev; +u8 link_major_rev; +u8 dev_type; +u8 n_data_gap; + +u32 n_fcu_set; +u32 maxblk_len_set; +u8 n_lanes_set; +u8 speed_range_set; +u8 n_lss_sync_set; +u8 n_lss_dir_set; +u8 n_data_gap_set; +u8 max_retry_set; };struct sdio_cccr {
include/linux/mmc/host.h +24 -1
@@ -16,6 +16,7 @@#include <linux/mmc/pm.h> #include <linux/dma-direction.h> #include <linux/blk-crypto-profile.h> +#include <linux/mmc/sd_uhs2.h> struct mmc_ios {unsigned int clock;/* clock rate */
@@ -99,7 +100,29 @@ struct mmc_clk_phase_map { };struct sd_uhs2_caps { -/* TODO: Add UHS-II capabilities for the host. */ +u32 dap; +u32 gap; +u32 group_desc; +u32 maxblk_len; +u32 n_fcu; +u8 n_lanes; +u8 addr64; +u8 card_type; +u8 phy_rev; +u8 speed_range; +u8 n_lss_sync; +u8 n_lss_dir; +u8 link_rev; +u8 host_type; +u8 n_data_gap; + +u32 maxblk_len_set; +u32 n_fcu_set; +u8 n_lanes_set; +u8 n_lss_sync_set; +u8 n_lss_dir_set; +u8 n_data_gap_set; +u8 max_retry_set; };enum sd_uhs2_operation {
include/linux/mmc/sd_uhs2.h new file +240 -0
240 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v20 6/22 mmc: core: Add New function to re-factoring the code
In reply to Victor ShihFrom: Victor Shih <[email protected]>
Add __mmc_go_idle function to re-factoring mmc_go_idle function.
--- drivers/mmc/core/mmc_ops.c | 24 ++++++++++++++++-------- drivers/mmc/core/mmc_ops.h | 1 + 2 files changed, 17 insertions(+), 8 deletions(-)
drivers/mmc/core/mmc_ops.c +16 -8
@@ -144,10 +144,24 @@ int mmc_set_dsr(struct mmc_host *host)return mmc_wait_for_cmd (host, &cmd,MMC_CMD_RETRIES ); } +int __mmc_go_idle (struct mmc_host *host) +{ +struct mmc_command cmd = {}; +int err; + + cmd.opcode =MMC_GO_IDLE_STATE ; + cmd.arg =0 ; + cmd.flags =MMC_RSP_SPI_R1 |MMC_RSP_NONE |MMC_CMD_BC ; + + err =mmc_wait_for_cmd (host, &cmd,0 ); +mmc_delay (1 ); + +return err; +} +int mmc_go_idle (struct mmc_host *host) {int err; -struct mmc_command cmd = {};/* * Non-SPI hosts need to prevent chipselect going active during
@@ -163,13 +177,7 @@ int mmc_go_idle(struct mmc_host *host)mmc_delay (1 ); } - cmd.opcode =MMC_GO_IDLE_STATE ; - cmd.arg =0 ; - cmd.flags =MMC_RSP_SPI_R1 |MMC_RSP_NONE |MMC_CMD_BC ; - - err =mmc_wait_for_cmd (host, &cmd,0 ); - -mmc_delay (1 ); + err =__mmc_go_idle (host);if (!mmc_host_is_spi (host)) {mmc_set_chip_select (host,MMC_CS_DONTCARE );
drivers/mmc/core/mmc_ops.h +1 -0
@@ -25,6 +25,7 @@ struct mmc_command;int mmc_select_card (struct mmc_card *card);int mmc_deselect_cards (struct mmc_host *host);int mmc_set_dsr (struct mmc_host *host); +int __mmc_go_idle (struct mmc_host *host);int mmc_go_idle (struct mmc_host *host);int mmc_send_op_cond (struct mmc_host *host,u32 ocr,u32 *rocr);int mmc_set_relative_addr (struct mmc_card *card);
Signature · 1 line
2.25.1
PATCH v20 7/22 mmc: core: Support UHS-II card control and access
In reply to Victor ShihFrom: Victor Shih <[email protected]>
Embed UHS-II access/control functionality into the MMC request processing flow.
---
Updates in V16:
- Separate the Error Recovery mechanism into a separate patch#8.
Updates in V15:
- Move struct uhs2_command uhs2_cmd to struct mmc_request and modify whatever other changers to make it work.
- Refer the SD Host Controller Standard Specification Section 3.10 to add Error Recovery mechanism to recover the command error.
Updates in V13:
- Separate __mmc_go_idle() into one patch for re-factorring the code.
- Move mmc_decode_scr declaration to sd.h.
- Ues uhs2_sd_tran to stead MMC_UHS2_SD_TRAN.
- Drop unnecessary comment.
Updates in V12:
- Use mmc_op_multi() to check DCMD which supports multi read/write in mmc_uhs2_prepare_cmd().
Updates in V10:
- Move some definitions of PatchV9[02/23] to PatchV10[06/23].
- Move some definitions of PatchV9[05/23] to PatchV10[06/23].
- Drop do_multi in the mmc_blk_rw_rq_prep().
- Use tmode_half_duplex to instead of uhs2_tmode0_flag.
- Move entire control of the tmode into mmc_uhs2_prepare_cmd().
Updates in V8:
- Add MMC_UHS2_SUPPORT to be cleared in sd_uhs2_detect().
- Modify return value in sd_uhs2_attach().
Updates in V7:
- Add mmc_uhs2_card_prepare_cmd helper function in sd_ops.h.
- Drop uhs2_state in favor of ios->timing.
- Remove unnecessary functions.
---
drivers/mmc/core/core.c | 6 +- drivers/mmc/core/sd.c | 10 +- drivers/mmc/core/sd.h | 5 + drivers/mmc/core/sd_ops.c | 9 + drivers/mmc/core/sd_ops.h | 13 + drivers/mmc/core/sd_uhs2.c | 1100 ++++++++++++++++++++++++++++++++++-- include/linux/mmc/core.h | 17 + include/linux/mmc/host.h | 15 + 8 files changed, 1136 insertions(+), 39 deletions(-)
drivers/mmc/core/core.c +5 -1
@@ -351,6 +351,8 @@ int mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)if (err)return err; +mmc_uhs2_card_prepare_cmd (host, mrq); +led_trigger_event (host->led,LED_FULL );__mmc_start_request (host, mrq);
@@ -450,6 +452,8 @@ int mmc_cqe_start_req(struct mmc_host *host, struct mmc_request *mrq)if (err) goto out_err; +mmc_uhs2_card_prepare_cmd (host, mrq); + err = host->cqe_ops->cqe_request (host, mrq);if (err) goto out_err;
@@ -1132,7 +1136,7 @@ u32 mmc_select_voltage(struct mmc_host *host, u32 ocr)return 0 ; } -if (host->caps2 &MMC_CAP2_FULL_PWR_CYCLE ) { +if (!mmc_card_uhs2 (host) && host->caps2 &MMC_CAP2_FULL_PWR_CYCLE ) { bit =ffs (ocr) -1 ; ocr &=3 << bit;mmc_power_cycle (host, ocr);
drivers/mmc/core/sd.c +5 -5
@@ -194,7 +194,7 @@ static int mmc_decode_csd(struct mmc_card *card)/* * Given a 64-bit response, decode to our card SCR structure. */ -static int mmc_decode_scr (struct mmc_card *card) +int mmc_decode_scr (struct mmc_card *card) {struct sd_scr *scr = &card->scr;unsigned int scr_struct;
@@ -894,7 +894,7 @@ int mmc_sd_get_csd(struct mmc_card *card)return 0 ; } -static int mmc_sd_get_ro (struct mmc_host *host) +int mmc_sd_get_ro (struct mmc_host *host) {int ro;
@@ -1623,7 +1623,7 @@ static void mmc_sd_detect(struct mmc_host *host) } } -static int sd_can_poweroff_notify (struct mmc_card *card) +int sd_can_poweroff_notify (struct mmc_card *card) {return card->ext_power.feature_support &SD_EXT_POWER_OFF_NOTIFY ; }
@@ -1651,7 +1651,7 @@ static int sd_busy_poweroff_notify_cb(void *cb_data, bool *busy)return 0 ; } -static int sd_poweroff_notify (struct mmc_card *card) +int sd_poweroff_notify (struct mmc_card *card) {struct sd_busy_data cb_data;u8 *reg_buf;
@@ -1699,7 +1699,7 @@ static int _mmc_sd_suspend(struct mmc_host *host)if (mmc_card_suspended (card)) goto out; -if (sd_can_poweroff_notify (card)) +if (mmc_sd_can_poweroff_notify (card)) err =sd_poweroff_notify (card);else if (!mmc_host_is_spi (host)) err =mmc_deselect_cards (host);
drivers/mmc/core/sd.h +5 -0
@@ -11,10 +11,15 @@ struct mmc_card;int mmc_sd_get_cid (struct mmc_host *host,u32 ocr,u32 *cid,u32 *rocr);int mmc_sd_get_csd (struct mmc_card *card); +int mmc_decode_scr (struct mmc_card *card); +int mmc_sd_get_ro (struct mmc_host *host);void mmc_decode_cid (struct mmc_card *card);int mmc_sd_setup_card (struct mmc_host *host,struct mmc_card *card,bool reinit);unsigned mmc_sd_get_max_clock (struct mmc_card *card);int mmc_sd_switch_hs (struct mmc_card *card); +int sd_can_poweroff_notify (struct mmc_card *card); +int sd_poweroff_notify (struct mmc_card *card); +#endif
drivers/mmc/core/sd_ops.c +9 -0
@@ -41,6 +41,15 @@ int mmc_app_cmd(struct mmc_host *host, struct mmc_card *card)if (WARN_ON (card && card->host != host))return -EINVAL ; +/* +* UHS2 packet has APP bit so only set APP_CMD flag here. +* Will set the APP bit when assembling UHS2 packet. +*/ +if (host->uhs2_sd_tran) { + host->uhs2_app_cmd = true; +return 0 ; + } + cmd.opcode =MMC_APP_CMD ;if (card) {
drivers/mmc/core/sd_ops.h +13 -0
@@ -11,6 +11,7 @@#include <linux/types.h> struct mmc_card ; +struct mmc_command ;struct mmc_host ;int mmc_app_set_bus_width (struct mmc_card *card,int width);
@@ -21,6 +22,18 @@ int mmc_send_relative_addr(struct mmc_host *host, unsigned int *rca);int mmc_app_send_scr (struct mmc_card *card);int mmc_app_sd_status (struct mmc_card *card,void *ssr);int mmc_app_cmd (struct mmc_host *host,struct mmc_card *card); +void mmc_uhs2_prepare_cmd (struct mmc_host *host,struct mmc_request *mrq); + +static inline void mmc_uhs2_card_prepare_cmd (struct mmc_host *host,struct mmc_request *mrq) +{ +if (host->uhs2_sd_tran) +mmc_uhs2_prepare_cmd (host, mrq); +} + +static inline int mmc_sd_can_poweroff_notify (struct mmc_card *card) +{ +return card->ext_power.feature_support &SD_EXT_POWER_OFF_NOTIFY ; +}#endif
drivers/mmc/core/sd_uhs2.c +1067 -33
1,259 lines not on this page · raw message
include/linux/mmc/core.h +17 -0
@@ -11,6 +11,20 @@struct mmc_data ;struct mmc_request ; +#define UHS2_MAX_PAYLOAD_LEN 2 +#define UHS2_MAX_RESP_LEN 20 + +struct uhs2_command { +u16 header; +u16 arg; +__be32 payload[UHS2_MAX_PAYLOAD_LEN ]; +u8 payload_len; +u8 packet_len; +u8 tmode_half_duplex; +u8 uhs2_resp[UHS2_MAX_RESP_LEN ];/* UHS2 native cmd resp */ +u8 uhs2_resp_len;/* UHS2 native cmd resp len */ +}; +struct mmc_command {u32 opcode;u32 arg;
@@ -96,6 +110,8 @@ struct mmc_command {unsigned int busy_timeout;/* busy detect timeout in ms */ struct mmc_data *data;/* data segment associated with cmd */ struct mmc_request *mrq;/* associated request */ + +struct uhs2_command *uhs2_cmd;/* UHS2 command */ };struct mmc_data {
@@ -154,6 +170,7 @@ struct mmc_request {const struct bio_crypt_ctx *crypto_ctx;int crypto_key_slot;#endif +struct uhs2_command uhs2_cmd; };struct mmc_card ;
include/linux/mmc/host.h +15 -0
@@ -126,6 +126,13 @@ struct sd_uhs2_caps { };enum sd_uhs2_operation { +UHS2_PHY_INIT =0 , +UHS2_SET_CONFIG , +UHS2_ENABLE_INT , +UHS2_DISABLE_INT , +UHS2_ENABLE_CLK , +UHS2_DISABLE_CLK , +UHS2_CHECK_DORMANT ,UHS2_SET_IOS , };
@@ -452,6 +459,8 @@ struct mmc_host {#endif #define MMC_CAP2_ALT_GPT_TEGRA (1 << 28)/* Host with eMMC that has GPT entry at a non-standard location */ +bool uhs2_sd_tran; +bool uhs2_app_cmd;/* Host UHS-II APP Command */ struct sd_uhs2_caps uhs2_caps;/* Host UHS-II capabilities */ int fixed_drv_type;/* fixed driver type for non-removable media */
@@ -713,6 +722,12 @@ static inline void mmc_debugfs_err_stats_inc(struct mmc_host *host, host->err_stats[stat] +=1 ; } +static inline int mmc_card_uhs2_hd_mode (struct mmc_host *host) +{ +return host->ios.timing ==MMC_TIMING_UHS2_SPEED_A_HD || + host->ios.timing ==MMC_TIMING_UHS2_SPEED_B_HD ; +} +int mmc_sd_switch (struct mmc_card *card,bool mode,int group,u8 value,u8 *resp);int mmc_send_status (struct mmc_card *card,u32 *status);
Signature · 1 line
2.25.1
PATCH v20 8/22 mmc: sdhci: add UHS-II related definitions in headers
In reply to Victor ShihFrom: Victor Shih <[email protected]>
Add UHS-II related definitions in sdhci.h and sdhci-uhs2.h.
---
Updates in V9:
- Modify the commit message.
Updates in V8:
- Use tabs instead of spaces.
Updates in V7:
- Reorder values and positions of definitions.
Updates in V6:
- Rename definitions.
- Use BIT() GENMASK() instead of bitwise operations.
---
drivers/mmc/host/sdhci-uhs2.h | 177 ++++++++++++++++++++++++++++++++++ drivers/mmc/host/sdhci.h | 54 ++++++++++- 2 files changed, 230 insertions(+), 1 deletion(-) create mode 100644 drivers/mmc/host/sdhci-uhs2.h
drivers/mmc/host/sdhci-uhs2.h new file +177 -0
@@ -0,0 +1,177 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* linux/drivers/mmc/host/sdhci-uhs2.h - Secure Digital Host Controller Interface driver +* +* Header file for Host Controller UHS2 related registers. +* +* Copyright (C) 2014 Intel Corp, All Rights Reserved. +*/ +#ifndef __SDHCI_UHS2_H +#define __SDHCI_UHS2_H + +#include <linux/bits.h> + +/* SDHCI Category C registers : UHS2 usage */ + +#define SDHCI_UHS2_CM_TRAN_RESP 0x10 +#define SDHCI_UHS2_SD_TRAN_RESP 0x18 +#define SDHCI_UHS2_SD_TRAN_RESP_1 0x1C + +/* SDHCI Category B registers : UHS2 only */ + +#define SDHCI_UHS2_BLOCK_SIZE 0x80 +#define SDHCI_UHS2_MAKE_BLKSZ (dma, blksz) ((((dma) & 0x7) << 12) | ((blksz) & 0xFFF)) + +#define SDHCI_UHS2_BLOCK_COUNT 0x84 + +#define SDHCI_UHS2_CMD_PACKET 0x88 +#define SDHCI_UHS2_CMD_PACK_MAX_LEN 20 + +#define SDHCI_UHS2_TRANS_MODE 0x9C +#define SDHCI_UHS2_TRNS_DMA BIT(0) +#define SDHCI_UHS2_TRNS_BLK_CNT_EN BIT(1) +#define SDHCI_UHS2_TRNS_DATA_TRNS_WRT BIT(4) +#define SDHCI_UHS2_TRNS_BLK_BYTE_MODE BIT(5) +#define SDHCI_UHS2_TRNS_RES_R5 BIT(6) +#define SDHCI_UHS2_TRNS_RES_ERR_CHECK_EN BIT(7) +#define SDHCI_UHS2_TRNS_RES_INT_DIS BIT(8) +#define SDHCI_UHS2_TRNS_WAIT_EBSY BIT(14) +#define SDHCI_UHS2_TRNS_2L_HD BIT(15) + +#define SDHCI_UHS2_CMD 0x9E +#define SDHCI_UHS2_CMD_SUB_CMD BIT(2) +#define SDHCI_UHS2_CMD_DATA BIT(5) +#define SDHCI_UHS2_CMD_TRNS_ABORT BIT(6) +#define SDHCI_UHS2_CMD_CMD12 BIT(7) +#define SDHCI_UHS2_CMD_DORMANT GENMASK(7, 6) +#define SDHCI_UHS2_CMD_PACK_LEN_MASK GENMASK(12, 8) + +#define SDHCI_UHS2_RESPONSE 0xA0 +#define SDHCI_UHS2_RESPONSE_MAX_LEN 20 + +#define SDHCI_UHS2_MSG_SELECT 0xB4 +#define SDHCI_UHS2_MSG_SELECT_CURR 0x0 +#define SDHCI_UHS2_MSG_SELECT_ONE 0x1 +#define SDHCI_UHS2_MSG_SELECT_TWO 0x2 +#define SDHCI_UHS2_MSG_SELECT_THREE 0x3 + +#define SDHCI_UHS2_MSG 0xB8 + +#define SDHCI_UHS2_DEV_INT_STATUS 0xBC + +#define SDHCI_UHS2_DEV_SELECT 0xBE +#define SDHCI_UHS2_DEV_SEL_MASK GENMASK(3, 0) +#define SDHCI_UHS2_DEV_SEL_INT_MSG_EN BIT(7) + +#define SDHCI_UHS2_DEV_INT_CODE 0xBF + +#define SDHCI_UHS2_SW_RESET 0xC0 +#define SDHCI_UHS2_SW_RESET_FULL BIT(0) +#define SDHCI_UHS2_SW_RESET_SD BIT(1) + +#define SDHCI_UHS2_TIMER_CTRL 0xC2 +#define SDHCI_UHS2_TIMER_CTRL_DEADLOCK_MASK GENMASK(7, 4) + +#define SDHCI_UHS2_INT_STATUS 0xC4 +#define SDHCI_UHS2_INT_STATUS_ENABLE 0xC8 +#define SDHCI_UHS2_INT_SIGNAL_ENABLE 0xCC +#define SDHCI_UHS2_INT_HEADER_ERR BIT(0) +#define SDHCI_UHS2_INT_RES_ERR BIT(1) +#define SDHCI_UHS2_INT_RETRY_EXP BIT(2) +#define SDHCI_UHS2_INT_CRC BIT(3) +#define SDHCI_UHS2_INT_FRAME_ERR BIT(4) +#define SDHCI_UHS2_INT_TID_ERR BIT(5) +#define SDHCI_UHS2_INT_UNRECOVER BIT(7) +#define SDHCI_UHS2_INT_EBUSY_ERR BIT(8) +#define SDHCI_UHS2_INT_ADMA_ERROR BIT(15) +#define SDHCI_UHS2_INT_CMD_TIMEOUT BIT(16) +#define SDHCI_UHS2_INT_DEADLOCK_TIMEOUT BIT(17) +#define SDHCI_UHS2_INT_VENDOR_ERR BIT(27) +#define SDHCI_UHS2_INT_ERROR_MASK ( \ + SDHCI_UHS2_INT_HEADER_ERR | \ + SDHCI_UHS2_INT_RES_ERR | \ + SDHCI_UHS2_INT_RETRY_EXP | \ + SDHCI_UHS2_INT_CRC | \ + SDHCI_UHS2_INT_FRAME_ERR | \ + SDHCI_UHS2_INT_TID_ERR | \ + SDHCI_UHS2_INT_UNRECOVER | \ + SDHCI_UHS2_INT_EBUSY_ERR | \ + SDHCI_UHS2_INT_ADMA_ERROR | \ + SDHCI_UHS2_INT_CMD_TIMEOUT | \ + SDHCI_UHS2_INT_DEADLOCK_TIMEOUT) +#define SDHCI_UHS2_INT_CMD_ERR_MASK ( \ + SDHCI_UHS2_INT_HEADER_ERR | \ + SDHCI_UHS2_INT_RES_ERR | \ + SDHCI_UHS2_INT_FRAME_ERR | \ + SDHCI_UHS2_INT_TID_ERR | \ + SDHCI_UHS2_INT_CMD_TIMEOUT) +/* CRC Error occurs during a packet receiving */ +#define SDHCI_UHS2_INT_DATA_ERR_MASK ( \ + SDHCI_UHS2_INT_RETRY_EXP | \ + SDHCI_UHS2_INT_CRC | \ + SDHCI_UHS2_INT_UNRECOVER | \ + SDHCI_UHS2_INT_EBUSY_ERR | \ + SDHCI_UHS2_INT_ADMA_ERROR | \ + SDHCI_UHS2_INT_DEADLOCK_TIMEOUT) + +#define SDHCI_UHS2_SETTINGS_PTR 0xE0 +#define SDHCI_UHS2_GEN_SETTINGS_POWER_LOW BIT(0) +#define SDHCI_UHS2_GEN_SETTINGS_N_LANES_MASK GENMASK(11, 8) +#define SDHCI_UHS2_FD_OR_2L_HD 0x0/* 2 lanes */ +#define SDHCI_UHS2_2D1U_FD 0x2/* 3 lanes, 2 down, 1 up, full duplex */ +#define SDHCI_UHS2_1D2U_FD 0x3/* 3 lanes, 1 down, 2 up, full duplex */ +#define SDHCI_UHS2_2D2U_FD 0x4/* 4 lanes, 2 down, 2 up, full duplex */ + +#define SDHCI_UHS2_PHY_SET_SPEED_B BIT(6) +#define SDHCI_UHS2_PHY_HIBERNATE_EN BIT(12) +#define SDHCI_UHS2_PHY_N_LSS_SYN_MASK GENMASK(19, 16) +#define SDHCI_UHS2_PHY_N_LSS_DIR_MASK GENMASK(23, 20) + +#define SDHCI_UHS2_TRAN_N_FCU_MASK GENMASK(15, 8) +#define SDHCI_UHS2_TRAN_RETRY_CNT_MASK GENMASK(17, 16) +#define SDHCI_UHS2_TRAN_1_N_DAT_GAP_MASK GENMASK(7, 0) + +#define SDHCI_UHS2_CAPS_PTR 0xE2 +#define SDHCI_UHS2_CAPS_OFFSET 0 +#define SDHCI_UHS2_CAPS_DAP_MASK GENMASK(3, 0) +#define SDHCI_UHS2_CAPS_GAP_MASK GENMASK(7, 4) +#define SDHCI_UHS2_CAPS_GAP (gap) ((gap) * 360) +#define SDHCI_UHS2_CAPS_LANE_MASK GENMASK(13, 8) +#define SDHCI_UHS2_CAPS_2L_HD_FD 1 +#define SDHCI_UHS2_CAPS_2D1U_FD 2 +#define SDHCI_UHS2_CAPS_1D2U_FD 4 +#define SDHCI_UHS2_CAPS_2D2U_FD 8 +#define SDHCI_UHS2_CAPS_ADDR_64 BIT(14) +#define SDHCI_UHS2_CAPS_BOOT BIT(15) +#define SDHCI_UHS2_CAPS_DEV_TYPE_MASK GENMASK(17, 16) +#define SDHCI_UHS2_CAPS_DEV_TYPE_RMV 0 +#define SDHCI_UHS2_CAPS_DEV_TYPE_EMB 1 +#define SDHCI_UHS2_CAPS_DEV_TYPE_EMB_RMV 2 +#define SDHCI_UHS2_CAPS_NUM_DEV_MASK GENMASK(21, 18) +#define SDHCI_UHS2_CAPS_BUS_TOPO_MASK GENMASK(23, 22) +#define SDHCI_UHS2_CAPS_BUS_TOPO_SHIFT 22 +#define SDHCI_UHS2_CAPS_BUS_TOPO_P2P 0 +#define SDHCI_UHS2_CAPS_BUS_TOPO_RING 1 +#define SDHCI_UHS2_CAPS_BUS_TOPO_HUB 2 +#define SDHCI_UHS2_CAPS_BUS_TOPO_HUB_RING 3 + +#define SDHCI_UHS2_CAPS_PHY_OFFSET 4 +#define SDHCI_UHS2_CAPS_PHY_REV_MASK GENMASK(5, 0) +#define SDHCI_UHS2_CAPS_PHY_RANGE_MASK GENMASK(7, 6) +#define SDHCI_UHS2_CAPS_PHY_RANGE_A 0 +#define SDHCI_UHS2_CAPS_PHY_RANGE_B 1 +#define SDHCI_UHS2_CAPS_PHY_N_LSS_SYN_MASK GENMASK(19, 16) +#define SDHCI_UHS2_CAPS_PHY_N_LSS_DIR_MASK GENMASK(23, 20) +#define SDHCI_UHS2_CAPS_TRAN_OFFSET 8 +#define SDHCI_UHS2_CAPS_TRAN_LINK_REV_MASK GENMASK(5, 0) +#define SDHCI_UHS2_CAPS_TRAN_N_FCU_MASK GENMASK(15, 8) +#define SDHCI_UHS2_CAPS_TRAN_HOST_TYPE_MASK GENMASK(18, 16) +#define SDHCI_UHS2_CAPS_TRAN_BLK_LEN_MASK GENMASK(31, 20) + +#define SDHCI_UHS2_CAPS_TRAN_1_OFFSET 12 +#define SDHCI_UHS2_CAPS_TRAN_1_N_DATA_GAP_MASK GENMASK(7, 0) + +#define SDHCI_UHS2_EMBED_CTRL_PTR 0xE6 +#define SDHCI_UHS2_VENDOR_PTR 0xE8 + +#endif /* __SDHCI_UHS2_H */
drivers/mmc/host/sdhci.h +53 -1
151 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v20 9/22 mmc: sdhci: add UHS-II module and add a kernel configuration
In reply to Victor ShihFrom: Victor Shih <[email protected]>
This patch adds sdhci-uhs2.c as a module for UHS-II support. This is a skeleton for further development in this patch series.
This kernel configuration, CONFIG_MMC_SDHCI_UHS2, will be used in the following commits to indicate UHS-II specific code in sdhci controllers.
---
Updates in V9:
- Modify the commit message.
Updates in V8:
- Modify MODULE_LICENSE from "GPL v2" to "GPL".
Updates in V6:
- Merage V5 of patch[7] and patch[9] in to V6 of patch[8].
---
drivers/mmc/host/Kconfig | 9 +++++++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-uhs2.c | 46 +++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 drivers/mmc/host/sdhci-uhs2.c
drivers/mmc/host/Kconfig +9 -0
@@ -98,6 +98,15 @@ config MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER This is the case for the Nintendo Wii SDHCI. +config MMC_SDHCI_UHS2 + tristate "UHS2 support on SDHCI controller" + depends on MMC_SDHCI + help + This option is selected by SDHCI controller drivers that want to + support UHS2-capable devices. + + If you have a controller with this feature, say Y or M here. + config MMC_SDHCI_PCI tristate "SDHCI support on PCI bus" depends on MMC_SDHCI && PCI
drivers/mmc/host/Makefile +1 -0
@@ -11,6 +11,7 @@ obj-$(CONFIG_MMC_PXA) += pxamci.o obj-$(CONFIG_MMC_MXC) += mxcmmc.o obj-$(CONFIG_MMC_MXS) += mxs-mmc.o obj-$(CONFIG_MMC_SDHCI) += sdhci.o +obj-$(CONFIG_MMC_SDHCI_UHS2) += sdhci-uhs2.o obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o sdhci-pci-y += sdhci-pci-core.o sdhci-pci-o2micro.o sdhci-pci-arasan.o \ sdhci-pci-dwc-mshc.o sdhci-pci-gli.o
drivers/mmc/host/sdhci-uhs2.c new file +46 -0
46 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v20 10/22 mmc: sdhci-uhs2: dump UHS-II registers
In reply to Victor ShihFrom: Victor Shih <[email protected]>
Dump UHS-II specific registers, if available, in sdhci_dumpregs() for informative/debugging use.
---
Updates in V14:
- Use mmc_card_uhs2() to stead sdhci_uhs2_mode() in the sdhci_uhs2_dump_regs().
Updates in V7:
- Use sdhci_uhs2_mode() to simplify code.
Updates in V6:
- Remove unnecessary code.
---
drivers/mmc/host/sdhci-uhs2.c | 30 ++++++++++++++++++++++++++++++ drivers/mmc/host/sdhci-uhs2.h | 4 ++++ drivers/mmc/host/sdhci.c | 3 +++ drivers/mmc/host/sdhci.h | 1 + 4 files changed, 38 insertions(+)
drivers/mmc/host/sdhci-uhs2.c +30 -0
@@ -18,6 +18,36 @@#define DRIVER_NAME "sdhci_uhs2" #define DBG(f, x...) \ pr_debug(DRIVER_NAME " [%s()]: " f, __func__, ## x) +#define SDHCI_UHS2_DUMP(f, x...) \ + pr_err("%s: " DRIVER_NAME ": " f, mmc_hostname(host->mmc), ## x) + +void sdhci_uhs2_dump_regs (struct sdhci_host *host) +{ +if (!(mmc_card_uhs2 (host->mmc))) +return ; + +SDHCI_UHS2_DUMP ("==================== UHS2 ==================\n" ); +SDHCI_UHS2_DUMP ("Blk Size: 0x%08x | Blk Cnt: 0x%08x\n" , +sdhci_readw (host,SDHCI_UHS2_BLOCK_SIZE ), +sdhci_readl (host,SDHCI_UHS2_BLOCK_COUNT )); +SDHCI_UHS2_DUMP ("Cmd: 0x%08x | Trn mode: 0x%08x\n" , +sdhci_readw (host,SDHCI_UHS2_CMD ), +sdhci_readw (host,SDHCI_UHS2_TRANS_MODE )); +SDHCI_UHS2_DUMP ("Int Stat: 0x%08x | Dev Sel : 0x%08x\n" , +sdhci_readw (host,SDHCI_UHS2_DEV_INT_STATUS ), +sdhci_readb (host,SDHCI_UHS2_DEV_SELECT )); +SDHCI_UHS2_DUMP ("Dev Int Code: 0x%08x\n" , +sdhci_readb (host,SDHCI_UHS2_DEV_INT_CODE )); +SDHCI_UHS2_DUMP ("Reset: 0x%08x | Timer: 0x%08x\n" , +sdhci_readw (host,SDHCI_UHS2_SW_RESET ), +sdhci_readw (host,SDHCI_UHS2_TIMER_CTRL )); +SDHCI_UHS2_DUMP ("ErrInt: 0x%08x | ErrIntEn: 0x%08x\n" , +sdhci_readl (host,SDHCI_UHS2_INT_STATUS ), +sdhci_readl (host,SDHCI_UHS2_INT_STATUS_ENABLE )); +SDHCI_UHS2_DUMP ("ErrSigEn: 0x%08x\n" , +sdhci_readl (host,SDHCI_UHS2_INT_SIGNAL_ENABLE )); +} +EXPORT_SYMBOL_GPL (sdhci_uhs2_dump_regs);/*****************************************************************************\ * *
drivers/mmc/host/sdhci-uhs2.h +4 -0
@@ -174,4 +174,8 @@#define SDHCI_UHS2_EMBED_CTRL_PTR 0xE6#define SDHCI_UHS2_VENDOR_PTR 0xE8 +struct sdhci_host ; + +void sdhci_uhs2_dump_regs (struct sdhci_host *host); +#endif /* __SDHCI_UHS2_H */
drivers/mmc/host/sdhci.c +3 -0
@@ -110,6 +110,9 @@ void sdhci_dumpregs(struct sdhci_host *host) } } +if (host->ops->dump_uhs2_regs) + host->ops->dump_uhs2_regs (host); +if (host->ops->dump_vendor_regs) host->ops->dump_vendor_regs (host);
drivers/mmc/host/sdhci.h +1 -0
@@ -719,6 +719,7 @@ struct sdhci_ops {void (*request_done)(struct sdhci_host *host,struct mmc_request *mrq);void (*dump_vendor_regs)(struct sdhci_host *host); +void (*dump_uhs2_regs)(struct sdhci_host *host); };#ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
Signature · 1 line
2.25.1
PATCH v20 11/22 mmc: sdhci-uhs2: add reset function
In reply to Victor ShihFrom: Victor Shih <[email protected]>
Sdhci_uhs2_reset() does a UHS-II specific reset operation.
---
Updates in V17:
- Move the sdhci_uhs2_reset_cmd_data() to the other patch it was used for the first time.
Updates in V16:
- Add sdhci_uhs2_reset_cmd_data() function.
Updates in V15:
- Refer the SD Host Controller Standard Specification Section 3.10 to add reset command data mechanism.
Updates in V14:
- Since mmc_card_uhs2() is the same as sdhci_uhs2_mode(), so drop sdhci_uhs2_mode() and use mmc_card_uhs2() instead of sdhci_uhs2_mode().
Updates in V13:
- Use ios timing to stead MMC_UHS2_SUPPORT for indicate the UHS2 mode.
Updates in V8:
- Adjust the position of matching brackets.
Updates in V6:
- Remove unnecessary functions and simplify code.
---
drivers/mmc/host/sdhci-uhs2.c | 37 +++++++++++++++++++++++++++++++++++ drivers/mmc/host/sdhci-uhs2.h | 1 + 2 files changed, 38 insertions(+)
drivers/mmc/host/sdhci-uhs2.c +37 -0
@@ -10,7 +10,9 @@* Author: AKASHI Takahiro <[email protected]> */ +#include <linux/delay.h> #include <linux/module.h> +#include <linux/iopoll.h> #include "sdhci.h" #include "sdhci-uhs2.h"
@@ -21,6 +23,8 @@ #define SDHCI_UHS2_DUMP(f, x...) \ pr_err("%s: " DRIVER_NAME ": " f, mmc_hostname(host->mmc), ## x) +#define UHS2_RESET_TIMEOUT_100MS 100000 +void sdhci_uhs2_dump_regs (struct sdhci_host *host) {if (!(mmc_card_uhs2 (host->mmc)))
@@ -49,6 +53,39 @@ void sdhci_uhs2_dump_regs(struct sdhci_host *host) }EXPORT_SYMBOL_GPL (sdhci_uhs2_dump_regs); +/*****************************************************************************\ +* * +* Low level functions * +* * +\*****************************************************************************/ + +/** +* sdhci_uhs2_reset - invoke SW reset +* @host: SDHCI host +* @mask: Control mask +* +* Invoke SW reset, depending on a bit in @mask and wait for completion. +*/ +void sdhci_uhs2_reset (struct sdhci_host *host,u16 mask) +{ +u32 val; + +sdhci_writew (host, mask,SDHCI_UHS2_SW_RESET ); + +if (mask &SDHCI_UHS2_SW_RESET_FULL ) + host->clock =0 ; + +/* hw clears the bit when it's done */ +if (read_poll_timeout_atomic (sdhci_readw, val, !(val & mask),10 , +UHS2_RESET_TIMEOUT_100MS , true, host,SDHCI_UHS2_SW_RESET )) { +pr_warn ("%s: %s: Reset 0x%x never completed. %s: clean reset bit.\n" , __func__, +mmc_hostname (host->mmc), (int )mask,mmc_hostname (host->mmc)); +sdhci_writeb (host,0 ,SDHCI_UHS2_SW_RESET ); +return ; + } +} +EXPORT_SYMBOL_GPL (sdhci_uhs2_reset); +/*****************************************************************************\ * * * Driver init/exit *
drivers/mmc/host/sdhci-uhs2.h +1 -0
@@ -177,5 +177,6 @@struct sdhci_host ;void sdhci_uhs2_dump_regs (struct sdhci_host *host); +void sdhci_uhs2_reset (struct sdhci_host *host,u16 mask);#endif /* __SDHCI_UHS2_H */
Signature · 1 line
2.25.1
PATCH v20 12/22 mmc: sdhci-uhs2: add set_power() to support vdd2
In reply to Victor ShihFrom: Victor Shih <[email protected]>
This is a UHS-II version of sdhci's set_power operation. Use sdhci_uhs2_set_power() to set VDD2 for support UHS2 interface. VDD2, as well as VDD, is handled here.
---
Updates in V17:
- Export sdhci_uhs2_set_power() function.
Updates in V13:
- Drop use vmmc2.
- Modify comment message.
Updates in V10:
- Move some definitions of PatchV9[05/23] to PatchV10[11/23].
Updates in V9:
- Modify annotations in sdhci_get_vdd_value().
Updates in V8:
- Adjust the position of matching brackets.
- Add the initial value of the pwr in sdhci_uhs2_set_power().
Updates in V7:
- Add clear the power reg before setting a new value
in sdhci_uhs2_set_power().
- Add MMC_VDD_34_35 case and MMC_VDD_35_36 case in sdhci_get_vdd_value().
- Drop pwr variable in sdhci_get_vdd_value().
Updates in V6:
- Add mmc_opt_regulator_set_ocr().
- Remove unnecessary functions.
---
drivers/mmc/host/sdhci-uhs2.c | 49 ++++++++++++++++++++++++++++ drivers/mmc/host/sdhci-uhs2.h | 1 + drivers/mmc/host/sdhci.c | 61 +++++++++++++++++++---------------- drivers/mmc/host/sdhci.h | 1 + 4 files changed, 84 insertions(+), 28 deletions(-)
drivers/mmc/host/sdhci-uhs2.c +49 -0
@@ -59,6 +59,13 @@ EXPORT_SYMBOL_GPL(sdhci_uhs2_dump_regs);* * \*****************************************************************************/ +static inline int mmc_opt_regulator_set_ocr (struct mmc_host *mmc, +struct regulator *supply, +unsigned short vdd_bit) +{ +return IS_ERR_OR_NULL (supply) ?0 :mmc_regulator_set_ocr (mmc, supply, vdd_bit); +} +/** * sdhci_uhs2_reset - invoke SW reset * @host: SDHCI host
@@ -86,6 +93,48 @@ void sdhci_uhs2_reset(struct sdhci_host *host, u16 mask) }EXPORT_SYMBOL_GPL (sdhci_uhs2_reset); +void sdhci_uhs2_set_power (struct sdhci_host *host,unsigned char mode,unsigned short vdd) +{ +struct mmc_host *mmc = host->mmc; +u8 pwr =0 ; + +if (mode !=MMC_POWER_OFF ) { + pwr =sdhci_get_vdd_value (vdd); +if (!pwr) +WARN (1 ,"%s: Invalid vdd %#x\n" , +mmc_hostname (host->mmc), vdd); + pwr |=SDHCI_VDD2_POWER_180 ; + } + +if (host->pwr == pwr) +return ; + host->pwr = pwr; + +if (pwr ==0 ) { +sdhci_writeb (host,0 ,SDHCI_POWER_CONTROL ); + +mmc_opt_regulator_set_ocr (mmc, mmc->supply.vmmc,0 ); +mmc_regulator_set_vqmmc2 (mmc, &mmc->ios); + }else { +mmc_opt_regulator_set_ocr (mmc, mmc->supply.vmmc, vdd); +/* support 1.8v only for now */ +mmc_regulator_set_vqmmc2 (mmc, &mmc->ios); + +/* Clear the power reg before setting a new value */ +sdhci_writeb (host,0 ,SDHCI_POWER_CONTROL ); + +/* vdd first */ + pwr |=SDHCI_POWER_ON ; +sdhci_writeb (host, pwr &0xf ,SDHCI_POWER_CONTROL ); +mdelay (5 ); + + pwr |=SDHCI_VDD2_POWER_ON ; +sdhci_writeb (host, pwr,SDHCI_POWER_CONTROL ); +mdelay (5 ); + } +} +EXPORT_SYMBOL_GPL (sdhci_uhs2_set_power); +/*****************************************************************************\ * * * Driver init/exit *
drivers/mmc/host/sdhci-uhs2.h +1 -0
@@ -178,5 +178,6 @@ struct sdhci_host;void sdhci_uhs2_dump_regs (struct sdhci_host *host);void sdhci_uhs2_reset (struct sdhci_host *host,u16 mask); +void sdhci_uhs2_set_power (struct sdhci_host *host,unsigned char mode,unsigned short vdd);#endif /* __SDHCI_UHS2_H */
drivers/mmc/host/sdhci.c +33 -28
81 lines not on this page · raw message
drivers/mmc/host/sdhci.h +1 -0
@@ -836,6 +836,7 @@ void sdhci_set_power(struct sdhci_host *host, unsigned char mode,void sdhci_set_power_and_bus_voltage (struct sdhci_host *host,unsigned char mode,unsigned short vdd); +unsigned short sdhci_get_vdd_value (unsigned short vdd);void sdhci_set_power_noreg (struct sdhci_host *host,unsigned char mode,unsigned short vdd);int sdhci_get_cd_nogpio (struct mmc_host *mmc);
Signature · 1 line
2.25.1
PATCH v20 13/22 mmc: sdhci-uhs2: add set_timeout()
In reply to Victor ShihFrom: Victor Shih <[email protected]>
This is a UHS-II version of sdhci's set_timeout() operation. Use sdhci_uhs2_set_timeout() to set and calculate the timeout time.
---
Updates in V14:
- Use mmc_card_uhs2() to stead sdhci_uhs2_mode() in the sdhci_uhs2_set_timeout().
Updates in V13:
- Modify comment message.
Updates in V8:
- Initialization be combined with declaration and realigned in sdhci_calc_timeout_uhs2().
- Forward declare struct mmc_command in sdhci_uhs2.h.
Updates in V6:
- Use GENMASK() and FIELD_PREP() in some case.
- Use sdhci_uhs2_mode() to simplify code.
- Remove unnecessary functions.
---
drivers/mmc/host/sdhci-uhs2.c | 72 +++++++++++++++++++++++++++++++++++ drivers/mmc/host/sdhci-uhs2.h | 2 + 2 files changed, 74 insertions(+)
drivers/mmc/host/sdhci-uhs2.c +72 -0
@@ -13,6 +13,7 @@#include <linux/delay.h> #include <linux/module.h> #include <linux/iopoll.h> +#include <linux/bitfield.h> #include "sdhci.h" #include "sdhci-uhs2.h"
@@ -135,6 +136,77 @@ void sdhci_uhs2_set_power(struct sdhci_host *host, unsigned char mode, unsigned }EXPORT_SYMBOL_GPL (sdhci_uhs2_set_power); +static u8 sdhci_calc_timeout_uhs2 (struct sdhci_host *host,u8 *cmd_res,u8 *dead_lock) +{ +/* timeout in us */ +unsigned int dead_lock_timeout =1 *1000 *1000 ; +unsigned int cmd_res_timeout =5 *1000 ; +unsigned int current_timeout; +u8 count; + +/* +* Figure out needed cycles. +* We do this in steps in order to fit inside a 32 bit int. +* The first step is the minimum timeout, which will have a +* minimum resolution of 6 bits: +* (1) 2^13*1000 > 2^22, +* (2) host->timeout_clk < 2^16 +* => +* (1) / (2) > 2^6 +*/ + count =0 ; + current_timeout = (1 <<13 ) *1000 / host->timeout_clk; +while (current_timeout < cmd_res_timeout) { + count++; + current_timeout <<=1 ; +if (count >=0xF ) +break ; + } + +if (count >=0xF ) { +DBG ("%s: Too large timeout 0x%x requested for CMD_RES!\n" , +mmc_hostname (host->mmc), count); + count =0xE ; + } + *cmd_res = count; + + count =0 ; + current_timeout = (1 <<13 ) *1000 / host->timeout_clk; +while (current_timeout < dead_lock_timeout) { + count++; + current_timeout <<=1 ; +if (count >=0xF ) +break ; + } + +if (count >=0xF ) { +DBG ("%s: Too large timeout 0x%x requested for DEADLOCK!\n" , +mmc_hostname (host->mmc), count); + count =0xE ; + } + *dead_lock = count; + +return count; +} + +static void __sdhci_uhs2_set_timeout (struct sdhci_host *host) +{ +u8 cmd_res, dead_lock; + +sdhci_calc_timeout_uhs2 (host, &cmd_res, &dead_lock); + cmd_res |=FIELD_PREP (SDHCI_UHS2_TIMER_CTRL_DEADLOCK_MASK , dead_lock); +sdhci_writeb (host, cmd_res,SDHCI_UHS2_TIMER_CTRL ); +} + +void sdhci_uhs2_set_timeout (struct sdhci_host *host,struct mmc_command *cmd) +{ +__sdhci_set_timeout (host, cmd); + +if (mmc_card_uhs2 (host->mmc)) +__sdhci_uhs2_set_timeout (host); +} +EXPORT_SYMBOL_GPL (sdhci_uhs2_set_timeout); +/*****************************************************************************\ * * * Driver init/exit *
drivers/mmc/host/sdhci-uhs2.h +2 -0
@@ -175,9 +175,11 @@#define SDHCI_UHS2_VENDOR_PTR 0xE8struct sdhci_host ; +struct mmc_command ;void sdhci_uhs2_dump_regs (struct sdhci_host *host);void sdhci_uhs2_reset (struct sdhci_host *host,u16 mask);void sdhci_uhs2_set_power (struct sdhci_host *host,unsigned char mode,unsigned short vdd); +void sdhci_uhs2_set_timeout (struct sdhci_host *host,struct mmc_command *cmd);#endif /* __SDHCI_UHS2_H */
Signature · 1 line
2.25.1
PATCH v20 14/22 mmc: sdhci-uhs2: add set_ios()
In reply to Victor ShihFrom: Victor Shih <[email protected]>
This is a sdhci version of mmc's set_ios operation. THis is used to handle basic IO bus setting. It covers both UHS-I and UHS-II.
---
Updates in V14:
- Use mmc_card_uhs2() to stead sdhci_uhs2_mode() in the sdhci_uhs2_set_ios().
Updates in V13:
- Add judgment condition for power mode in the __sdhci_uhs2_set_ios().
- Modify comment message.
Updates in V9:
- Simplity the turning_on_clk in sdhci_set_ios().
Updates in V8:
- Add the judgment formula for MMC_TIMING_SPEED_A_HD, MMC_TIMING_SPEED_B and MMC_TIMING_SPEED_B_HD in __sdhci_uhs2_set_ios().
- Add the switch case for MMC_TIMING_SPEED_A_HD, MMC_TIMING_SPEED_B and MMC_TIMING_SPEED_B_HD in sdhci_get_preset_value().
- mmc_opt_regulator_set_ocr() to instead of mmc_regulator_set_ocr() in sdhci_uhs2_set_ios().
Updates in V7:
- Remove unnecessary functions.
Updates in V6:
- Modify return value in some functions.
- Remove unnecessary functions.
---
drivers/mmc/host/sdhci-uhs2.c | 95 +++++++++++++++++++++++++++++++++++ drivers/mmc/host/sdhci-uhs2.h | 1 + drivers/mmc/host/sdhci.c | 55 ++++++++++++-------- drivers/mmc/host/sdhci.h | 2 + 4 files changed, 132 insertions(+), 21 deletions(-)
drivers/mmc/host/sdhci-uhs2.c +95 -0
@@ -207,6 +207,101 @@ void sdhci_uhs2_set_timeout(struct sdhci_host *host, struct mmc_command *cmd) }EXPORT_SYMBOL_GPL (sdhci_uhs2_set_timeout); +/** +* sdhci_uhs2_clear_set_irqs - set Error Interrupt Status Enable register +* @host: SDHCI host +* @clear: bit-wise clear mask +* @set: bit-wise set mask +* +* Set/unset bits in UHS-II Error Interrupt Status Enable register +*/ +void sdhci_uhs2_clear_set_irqs (struct sdhci_host *host,u32 clear,u32 set) +{ +u32 ier; + + ier =sdhci_readl (host,SDHCI_UHS2_INT_STATUS_ENABLE ); + ier &= ~clear; + ier |= set; +sdhci_writel (host, ier,SDHCI_UHS2_INT_STATUS_ENABLE ); +sdhci_writel (host, ier,SDHCI_UHS2_INT_SIGNAL_ENABLE ); +} +EXPORT_SYMBOL_GPL (sdhci_uhs2_clear_set_irqs); + +static void __sdhci_uhs2_set_ios (struct mmc_host *mmc,struct mmc_ios *ios) +{ +struct sdhci_host *host =mmc_priv (mmc); +u8 cmd_res, dead_lock; +u16 ctrl_2; + +/* UHS2 Timeout Control */ +sdhci_calc_timeout_uhs2 (host, &cmd_res, &dead_lock); + +/* change to use calculate value */ + cmd_res |=FIELD_PREP (SDHCI_UHS2_TIMER_CTRL_DEADLOCK_MASK , dead_lock); + +sdhci_uhs2_clear_set_irqs (host, +SDHCI_UHS2_INT_CMD_TIMEOUT | +SDHCI_UHS2_INT_DEADLOCK_TIMEOUT , +0 ); +sdhci_writeb (host, cmd_res,SDHCI_UHS2_TIMER_CTRL ); +sdhci_uhs2_clear_set_irqs (host,0 , +SDHCI_UHS2_INT_CMD_TIMEOUT | +SDHCI_UHS2_INT_DEADLOCK_TIMEOUT ); + +/* UHS2 timing. Note, UHS2 timing is disabled when powering off */ + ctrl_2 =sdhci_readw (host,SDHCI_HOST_CONTROL2 ); +if (ios->power_mode !=MMC_POWER_OFF && + (ios->timing ==MMC_TIMING_UHS2_SPEED_A || + ios->timing ==MMC_TIMING_UHS2_SPEED_A_HD || + ios->timing ==MMC_TIMING_UHS2_SPEED_B || + ios->timing ==MMC_TIMING_UHS2_SPEED_B_HD )) + ctrl_2 |=SDHCI_CTRL_UHS2 |SDHCI_CTRL_UHS2_ENABLE ; +else + ctrl_2 &= ~(SDHCI_CTRL_UHS2 |SDHCI_CTRL_UHS2_ENABLE ); +sdhci_writew (host, ctrl_2,SDHCI_HOST_CONTROL2 ); + host->timing = ios->timing; + +if (!(host->quirks2 &SDHCI_QUIRK2_PRESET_VALUE_BROKEN )) +sdhci_enable_preset_value (host, true); + +if (host->ops->set_power) + host->ops->set_power (host, ios->power_mode, ios->vdd); +else +sdhci_uhs2_set_power (host, ios->power_mode, ios->vdd); + +sdhci_set_clock (host, host->clock); +} + +static int sdhci_uhs2_set_ios (struct mmc_host *mmc,struct mmc_ios *ios) +{ +struct sdhci_host *host =mmc_priv (mmc); + +pr_debug ("%s: clock %uHz powermode %u Vdd %u timing %u\n" , +mmc_hostname (mmc), ios->clock, ios->power_mode, ios->vdd, ios->timing); + +if (!mmc_card_uhs2 (mmc)) { +sdhci_set_ios (mmc, ios); +return 0 ; + } + +if (ios->power_mode ==MMC_POWER_UNDEFINED ) +return 0 ; + +if (host->flags &SDHCI_DEVICE_DEAD ) { +if (ios->power_mode ==MMC_POWER_OFF ) { +mmc_opt_regulator_set_ocr (mmc, mmc->supply.vmmc,0 ); +mmc_regulator_set_vqmmc2 (mmc, ios); + } +return -1 ; + } + +sdhci_set_ios_common (mmc, ios); + +__sdhci_uhs2_set_ios (mmc, ios); + +return 0 ; +} +/*****************************************************************************\ * * * Driver init/exit *
drivers/mmc/host/sdhci-uhs2.h +1 -0
@@ -181,5 +181,6 @@ void sdhci_uhs2_dump_regs(struct sdhci_host *host);void sdhci_uhs2_reset (struct sdhci_host *host,u16 mask);void sdhci_uhs2_set_power (struct sdhci_host *host,unsigned char mode,unsigned short vdd);void sdhci_uhs2_set_timeout (struct sdhci_host *host,struct mmc_command *cmd); +void sdhci_uhs2_clear_set_irqs (struct sdhci_host *host,u32 clear,u32 set);#endif /* __SDHCI_UHS2_H */
drivers/mmc/host/sdhci.c +34 -21
99 lines not on this page · raw message
drivers/mmc/host/sdhci.h +2 -0
@@ -848,6 +848,8 @@ void sdhci_reset(struct sdhci_host *host, u8 mask);void sdhci_set_uhs_signaling (struct sdhci_host *host,unsigned timing);int sdhci_execute_tuning (struct mmc_host *mmc,u32 opcode);int __sdhci_execute_tuning (struct sdhci_host *host,u32 opcode); +void sdhci_enable_preset_value (struct sdhci_host *host,bool enable); +void sdhci_set_ios_common (struct mmc_host *mmc,struct mmc_ios *ios);void sdhci_set_ios (struct mmc_host *mmc,struct mmc_ios *ios);int sdhci_start_signal_voltage_switch (struct mmc_host *mmc,struct mmc_ios *ios);
Signature · 1 line
2.25.1
PATCH v20 15/22 mmc: sdhci-uhs2: add uhs2_control() to initialise the interface
In reply to Victor ShihFrom: Victor Shih <[email protected]>
UHS-II interface (related registers) will be initialized here. The operations include mmc's uhs2_set_reg operations, mmc's uhs2_detect_init operations, uhs2_[enable|disable]_clk operations, uhs2_set_ios operations. After detected the UHS-II interface, the host's UHS-II capabilities will be set up here and interrupts will also be enabled.
---
Updates in V15:
- Resolve merge conflicts and reduce unnecessary line breaks.
Updates in V13:
- Merge Patch#15, Patch#16 and Patch#17 of v12 version into Patch#15 in v13 version.
- Use definitions to simplify code.
- Modify comment message.
---
drivers/mmc/host/sdhci-uhs2.c | 228 ++++++++++++++++++++++++++++++++++ 1 file changed, 228 insertions(+)
drivers/mmc/host/sdhci-uhs2.c +228 -0
@@ -25,6 +25,9 @@ pr_err("%s: " DRIVER_NAME ": " f, mmc_hostname(host->mmc), ## x) #define UHS2_RESET_TIMEOUT_100MS 100000 +#define UHS2_CHECK_DORMANT_TIMEOUT_100MS 100000 +#define UHS2_INTERFACE_DETECT_TIMEOUT_100MS 100000 +#define UHS2_LANE_SYNC_TIMEOUT_150MS 150000 void sdhci_uhs2_dump_regs(struct sdhci_host *host) {
@@ -302,6 +305,229 @@ static int sdhci_uhs2_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)return 0 ; } +static int sdhci_uhs2_interface_detect (struct sdhci_host *host) +{ +u32 val; + +if (read_poll_timeout (sdhci_readl, val, (val &SDHCI_UHS2_IF_DETECT ), +100 ,UHS2_INTERFACE_DETECT_TIMEOUT_100MS , true, + host,SDHCI_PRESENT_STATE )) { +pr_warn ("%s: not detect UHS2 interface in 100ms.\n" ,mmc_hostname (host->mmc)); +sdhci_dumpregs (host); +return -EIO ; + } + +/* Enable UHS2 error interrupts */ +sdhci_uhs2_clear_set_irqs (host,SDHCI_INT_ALL_MASK ,SDHCI_UHS2_INT_ERROR_MASK ); + +if (read_poll_timeout (sdhci_readl, val, (val &SDHCI_UHS2_LANE_SYNC ), +100 ,UHS2_LANE_SYNC_TIMEOUT_150MS , true, host,SDHCI_PRESENT_STATE )) { +pr_warn ("%s: UHS2 Lane sync fail in 150ms.\n" ,mmc_hostname (host->mmc)); +sdhci_dumpregs (host); +return -EIO ; + } + +DBG ("%s: UHS2 Lane synchronized in UHS2 mode, PHY is initialized.\n" , +mmc_hostname (host->mmc)); +return 0 ; +} + +static int sdhci_uhs2_init (struct sdhci_host *host) +{ +u16 caps_ptr =0 ; +u32 caps_gen =0 ; +u32 caps_phy =0 ; +u32 caps_tran[2 ] = {0 ,0 }; +struct mmc_host *mmc = host->mmc; + + caps_ptr =sdhci_readw (host,SDHCI_UHS2_CAPS_PTR ); +if (caps_ptr <0x100 || caps_ptr >0x1FF ) { +pr_err ("%s: SDHCI_UHS2_CAPS_PTR(%d) is wrong.\n" , +mmc_hostname (mmc), caps_ptr); +return -ENODEV ; + } + caps_gen =sdhci_readl (host, caps_ptr +SDHCI_UHS2_CAPS_OFFSET ); + caps_phy =sdhci_readl (host, caps_ptr +SDHCI_UHS2_CAPS_PHY_OFFSET ); + caps_tran[0 ] =sdhci_readl (host, caps_ptr +SDHCI_UHS2_CAPS_TRAN_OFFSET ); + caps_tran[1 ] =sdhci_readl (host, caps_ptr +SDHCI_UHS2_CAPS_TRAN_1_OFFSET ); + +/* General Caps */ + mmc->uhs2_caps.dap = caps_gen &SDHCI_UHS2_CAPS_DAP_MASK ; + mmc->uhs2_caps.gap =FIELD_GET (SDHCI_UHS2_CAPS_GAP_MASK , caps_gen); + mmc->uhs2_caps.n_lanes =FIELD_GET (SDHCI_UHS2_CAPS_LANE_MASK , caps_gen); + mmc->uhs2_caps.addr64 = (caps_gen &SDHCI_UHS2_CAPS_ADDR_64 ) ?1 :0 ; + mmc->uhs2_caps.card_type =FIELD_GET (SDHCI_UHS2_CAPS_DEV_TYPE_MASK , caps_gen); + +/* PHY Caps */ + mmc->uhs2_caps.phy_rev = caps_phy &SDHCI_UHS2_CAPS_PHY_REV_MASK ; + mmc->uhs2_caps.speed_range =FIELD_GET (SDHCI_UHS2_CAPS_PHY_RANGE_MASK , caps_phy); + mmc->uhs2_caps.n_lss_sync =FIELD_GET (SDHCI_UHS2_CAPS_PHY_N_LSS_SYN_MASK , caps_phy); + mmc->uhs2_caps.n_lss_dir =FIELD_GET (SDHCI_UHS2_CAPS_PHY_N_LSS_DIR_MASK , caps_phy); +if (mmc->uhs2_caps.n_lss_sync ==0 ) + mmc->uhs2_caps.n_lss_sync =16 <<2 ; +else + mmc->uhs2_caps.n_lss_sync <<=2 ; +if (mmc->uhs2_caps.n_lss_dir ==0 ) + mmc->uhs2_caps.n_lss_dir =16 <<3 ; +else + mmc->uhs2_caps.n_lss_dir <<=3 ; + +/* LINK/TRAN Caps */ + mmc->uhs2_caps.link_rev = caps_tran[0 ] &SDHCI_UHS2_CAPS_TRAN_LINK_REV_MASK ; + mmc->uhs2_caps.n_fcu =FIELD_GET (SDHCI_UHS2_CAPS_TRAN_N_FCU_MASK , caps_tran[0 ]); +if (mmc->uhs2_caps.n_fcu ==0 ) + mmc->uhs2_caps.n_fcu =256 ; + mmc->uhs2_caps.host_type =FIELD_GET (SDHCI_UHS2_CAPS_TRAN_HOST_TYPE_MASK , caps_tran[0 ]); + mmc->uhs2_caps.maxblk_len =FIELD_GET (SDHCI_UHS2_CAPS_TRAN_BLK_LEN_MASK , caps_tran[0 ]); + mmc->uhs2_caps.n_data_gap = caps_tran[1 ] &SDHCI_UHS2_CAPS_TRAN_1_N_DATA_GAP_MASK ; + +return 0 ; +} + +static int sdhci_uhs2_do_detect_init (struct mmc_host *mmc) +{ +struct sdhci_host *host =mmc_priv (mmc); + +DBG ("Begin do uhs2 detect init.\n" ); + +if (sdhci_uhs2_interface_detect (host)) { +pr_warn ("%s: cannot detect UHS2 interface.\n" ,mmc_hostname (host->mmc)); +return -EIO ; + } + +if (sdhci_uhs2_init (host)) { +pr_warn ("%s: UHS2 init fail.\n" ,mmc_hostname (host->mmc)); +return -EIO ; + } + +/* Init complete, do soft reset and enable UHS2 error irqs. */ +sdhci_uhs2_reset (host,SDHCI_UHS2_SW_RESET_SD ); +sdhci_uhs2_clear_set_irqs (host,SDHCI_INT_ALL_MASK ,SDHCI_UHS2_INT_ERROR_MASK ); +/* +* N.B SDHCI_INT_ENABLE and SDHCI_SIGNAL_ENABLE was cleared +* by SDHCI_UHS2_SW_RESET_SD +*/ +sdhci_writel (host, host->ier,SDHCI_INT_ENABLE ); +sdhci_writel (host, host->ier,SDHCI_SIGNAL_ENABLE ); + +return 0 ; +} + +static int sdhci_uhs2_disable_clk (struct mmc_host *mmc) +{ +struct sdhci_host *host =mmc_priv (mmc); +u16 clk =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); + + clk &= ~SDHCI_CLOCK_CARD_EN ; +sdhci_writew (host, clk,SDHCI_CLOCK_CONTROL ); + +return 0 ; +} + +static int sdhci_uhs2_enable_clk (struct mmc_host *mmc) +{ +struct sdhci_host *host =mmc_priv (mmc); +u16 clk =sdhci_readw (host,SDHCI_CLOCK_CONTROL ); +int timeout_us =20000 ;/* 20ms */ +u32 val; + + clk |=SDHCI_CLOCK_CARD_EN ; +sdhci_writew (host, clk,SDHCI_CLOCK_CONTROL ); + +if (read_poll_timeout (sdhci_readw, val, (val &SDHCI_CLOCK_INT_STABLE ), +10 , timeout_us, true, host,SDHCI_CLOCK_CONTROL )) { +pr_err ("%s: Internal clock never stabilised.\n" ,mmc_hostname (host->mmc)); +sdhci_dumpregs (host); +return -EIO ; + } +return 0 ; +} + +static void sdhci_uhs2_set_config (struct sdhci_host *host) +{ +u32 value; +u16 sdhci_uhs2_set_ptr =sdhci_readw (host,SDHCI_UHS2_SETTINGS_PTR ); +u16 sdhci_uhs2_gen_set_reg = sdhci_uhs2_set_ptr; +u16 sdhci_uhs2_phy_set_reg = sdhci_uhs2_set_ptr +4 ; +u16 sdhci_uhs2_tran_set_reg = sdhci_uhs2_set_ptr +8 ; +u16 sdhci_uhs2_tran_set_1_reg = sdhci_uhs2_set_ptr +12 ; + +/* Set Gen Settings */ + value =FIELD_PREP (SDHCI_UHS2_GEN_SETTINGS_N_LANES_MASK , host->mmc->uhs2_caps.n_lanes_set); +sdhci_writel (host, value, sdhci_uhs2_gen_set_reg); + +/* Set PHY Settings */ + value =FIELD_PREP (SDHCI_UHS2_PHY_N_LSS_DIR_MASK , host->mmc->uhs2_caps.n_lss_dir_set) | +FIELD_PREP (SDHCI_UHS2_PHY_N_LSS_SYN_MASK , host->mmc->uhs2_caps.n_lss_sync_set); +if (host->mmc->ios.timing ==MMC_TIMING_UHS2_SPEED_B || + host->mmc->ios.timing ==MMC_TIMING_UHS2_SPEED_B_HD ) + value |=SDHCI_UHS2_PHY_SET_SPEED_B ; +sdhci_writel (host, value, sdhci_uhs2_phy_set_reg); + +/* Set LINK-TRAN Settings */ + value =FIELD_PREP (SDHCI_UHS2_TRAN_RETRY_CNT_MASK , host->mmc->uhs2_caps.max_retry_set) | +FIELD_PREP (SDHCI_UHS2_TRAN_N_FCU_MASK , host->mmc->uhs2_caps.n_fcu_set); +sdhci_writel (host, value, sdhci_uhs2_tran_set_reg); +sdhci_writel (host, host->mmc->uhs2_caps.n_data_gap_set, sdhci_uhs2_tran_set_1_reg); +} + +static int sdhci_uhs2_check_dormant (struct sdhci_host *host) +{ +u32 val; + +if (read_poll_timeout (sdhci_readl, val, (val &SDHCI_UHS2_IN_DORMANT_STATE ), +100 ,UHS2_CHECK_DORMANT_TIMEOUT_100MS , true, host, +SDHCI_PRESENT_STATE )) { +pr_warn ("%s: UHS2 IN_DORMANT fail in 100ms.\n" ,mmc_hostname (host->mmc)); +sdhci_dumpregs (host); +return -EIO ; + } +return 0 ; +} + +static int sdhci_uhs2_control (struct mmc_host *mmc,enum sd_uhs2_operation op) +{ +struct sdhci_host *host =mmc_priv (mmc); +struct mmc_ios *ios = &mmc->ios; +int err =0 ; + +DBG ("Begin uhs2 control, act %d.\n" , op); + +switch (op) { +case UHS2_PHY_INIT : + err =sdhci_uhs2_do_detect_init (mmc); +break ; +case UHS2_SET_CONFIG : +sdhci_uhs2_set_config (host); +break ; +case UHS2_ENABLE_INT : +sdhci_uhs2_clear_set_irqs (host,0 ,SDHCI_INT_CARD_INT ); +break ; +case UHS2_DISABLE_INT : +sdhci_uhs2_clear_set_irqs (host,SDHCI_INT_CARD_INT ,0 ); +break ; +case UHS2_CHECK_DORMANT : + err =sdhci_uhs2_check_dormant (host); +break ; +case UHS2_DISABLE_CLK : + err =sdhci_uhs2_disable_clk (mmc); +break ; +case UHS2_ENABLE_CLK : + err =sdhci_uhs2_enable_clk (mmc); +break ; +case UHS2_SET_IOS : + err =sdhci_uhs2_set_ios (mmc, ios); +break ; +default : +pr_err ("%s: input sd uhs2 operation %d is wrong!\n" , +mmc_hostname (host->mmc), op); + err = -EIO ; +break ; + } + +return err; +} +/*****************************************************************************\ * * * Driver init/exit *
@@ -310,6 +536,8 @@ static int sdhci_uhs2_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)static int sdhci_uhs2_host_ops_init (struct sdhci_host *host) { + host->mmc_host_ops.uhs2_control = sdhci_uhs2_control; +return 0 ; }
Signature · 1 line
2.25.1
PATCH v20 16/22 mmc: sdhci-uhs2: add request() and others
In reply to Victor ShihFrom: Victor Shih <[email protected]>
This is a sdhci version of mmc's request operation. It covers both UHS-I and UHS-II.
---
Updates in V19:
- cmd->uhs2_cmd->uhs2_resp is always true, remove it from safety check in the __sdhci_uhs2_finish_command().
Updates in V17:
- Add new parameter to __sdhci_finish_data_common().
Updates in V16:
- Remove irrelevant definition in the sdhci_calc_timeout_uhs2().
Updates in V15:
- Adjust the parameters used in the __sdhci_uhs2_finish_command() to match changes in the Patch#7.
Updates in V14:
- Use mmc_card_uhs2() to stead sdhci_uhs2_mode() in the sdhci_uhs2_request().
Updates in V13:
- Re-order function to avoid declaration.
- Remove unnecessary function.
Updates in V11:
- Drop the check mmc_card_uhs2_hd_mode(host->mmc) in sdhci_uhs2_set_transfer_mode().
Updates in V10:
- Use tmode_half_duplex to instead of uhs2_tmode0_flag in sdhci_uhs2_set_transfer_mode().
Updates in V9:
- Modify the annotations in __sdhci_uhs2_send_command().
Updates in V8:
- Adjust the position of matching brackets in sdhci_uhs2_send_command_retry().
- Modify CameCase definition in __sdhci_uhs2_finish_command().
- Modify error message in __sdhci_uhs2_finish_command().
- sdhci_uhs2_send_command_retry() to instead of sdhci_uhs2_send_command() in sdhci_uhs2_request().
- Use sdhci_uhs2_mode() to simplify code in sdhci_uhs2_request_atomic().
- Add forward declaration for sdhci_send_command().
Updates in V7:
- Cancel export state of some functions.
- Remove unnecessary whitespace changes.
Updates in V6:
- Add uhs2_dev_cmd() to simplify code.
- Remove unnecessary functions.
- Cancel export state of some functions.
- Drop use CONFIG_MMC_DEBUG().
- Wrap at 100 columns in some functions.
---
drivers/mmc/host/sdhci-uhs2.c | 378 ++++++++++++++++++++++++++++++++++ drivers/mmc/host/sdhci.c | 53 +++-- drivers/mmc/host/sdhci.h | 8 + 3 files changed, 423 insertions(+), 16 deletions(-)
drivers/mmc/host/sdhci-uhs2.c +378 -0
@@ -14,6 +14,8 @@#include <linux/module.h> #include <linux/iopoll.h> #include <linux/bitfield.h> +#include <linux/mmc/mmc.h> +#include <linux/mmc/host.h> #include "sdhci.h" #include "sdhci-uhs2.h"
@@ -29,6 +31,8 @@#define UHS2_INTERFACE_DETECT_TIMEOUT_100MS 100000#define UHS2_LANE_SYNC_TIMEOUT_150MS 150000 +#define UHS2_ARG_IOADR_MASK 0xfff +void sdhci_uhs2_dump_regs (struct sdhci_host *host) {if (!(mmc_card_uhs2 (host->mmc)))
@@ -63,6 +67,11 @@ EXPORT_SYMBOL_GPL(sdhci_uhs2_dump_regs);* * \*****************************************************************************/ +static inline u16 uhs2_dev_cmd (struct mmc_command *cmd) +{ +return be16_to_cpu ((__be16 )cmd->uhs2_cmd->arg) &UHS2_ARG_IOADR_MASK ; +} +static inline int mmc_opt_regulator_set_ocr (struct mmc_host *mmc,struct regulator *supply,unsigned short vdd_bit)
@@ -528,6 +537,374 @@ static int sdhci_uhs2_control(struct mmc_host *mmc, enum sd_uhs2_operation op)return err; } +/*****************************************************************************\ +* * +* Core functions * +* * +\*****************************************************************************/ + +static void sdhci_uhs2_prepare_data (struct sdhci_host *host,struct mmc_command *cmd) +{ +struct mmc_data *data = cmd->data; + +sdhci_initialize_data (host, data); + +sdhci_prepare_dma (host, data); + +sdhci_writew (host, data->blksz,SDHCI_UHS2_BLOCK_SIZE ); +sdhci_writew (host, data->blocks,SDHCI_UHS2_BLOCK_COUNT ); +} + +static void sdhci_uhs2_finish_data (struct sdhci_host *host) +{ +struct mmc_data *data = host->data; + +__sdhci_finish_data_common (host, true); + +__sdhci_finish_mrq (host, data->mrq); +} + +static void sdhci_uhs2_set_transfer_mode (struct sdhci_host *host,struct mmc_command *cmd) +{ +u16 mode; +struct mmc_data *data = cmd->data; + +if (!data) { +/* clear Auto CMD settings for no data CMDs */ +if (uhs2_dev_cmd (cmd) ==UHS2_DEV_CMD_TRANS_ABORT ) { + mode =0 ; + }else { + mode =sdhci_readw (host,SDHCI_UHS2_TRANS_MODE ); +if (cmd->opcode ==MMC_STOP_TRANSMISSION || cmd->opcode ==MMC_ERASE ) + mode |=SDHCI_UHS2_TRNS_WAIT_EBSY ; +else +/* send status mode */ +if (cmd->opcode ==MMC_SEND_STATUS ) + mode =0 ; + } + +DBG ("UHS2 no data trans mode is 0x%x.\n" , mode); + +sdhci_writew (host, mode,SDHCI_UHS2_TRANS_MODE ); +return ; + } + +WARN_ON (!host->data); + + mode =SDHCI_UHS2_TRNS_BLK_CNT_EN |SDHCI_UHS2_TRNS_WAIT_EBSY ; +if (data->flags &MMC_DATA_WRITE ) + mode |=SDHCI_UHS2_TRNS_DATA_TRNS_WRT ; + +if (data->blocks ==1 && + data->blksz !=512 && + cmd->opcode !=MMC_READ_SINGLE_BLOCK && + cmd->opcode !=MMC_WRITE_BLOCK ) { + mode &= ~SDHCI_UHS2_TRNS_BLK_CNT_EN ; + mode |=SDHCI_UHS2_TRNS_BLK_BYTE_MODE ; + } + +if (host->flags &SDHCI_REQ_USE_DMA ) + mode |=SDHCI_UHS2_TRNS_DMA ; + +if (cmd->uhs2_cmd->tmode_half_duplex) + mode |=SDHCI_UHS2_TRNS_2L_HD ; + +sdhci_writew (host, mode,SDHCI_UHS2_TRANS_MODE ); + +DBG ("UHS2 trans mode is 0x%x.\n" , mode); +} + +static void __sdhci_uhs2_send_command (struct sdhci_host *host,struct mmc_command *cmd) +{ +int i, j; +int cmd_reg; + + i =0 ; +sdhci_writel (host, + ((u32 )cmd->uhs2_cmd->arg <<16 ) | + (u32 )cmd->uhs2_cmd->header, +SDHCI_UHS2_CMD_PACKET + i); + i +=4 ; + +/* +* Per spec, payload (config) should be MSB before sending out. +* But we don't need convert here because had set payload as +* MSB when preparing config read/write commands. +*/ +for (j =0 ; j < cmd->uhs2_cmd->payload_len /sizeof (u32); j++) { +sdhci_writel (host, *(cmd->uhs2_cmd->payload + j),SDHCI_UHS2_CMD_PACKET + i); + i +=4 ; + } + +for ( ; i <SDHCI_UHS2_CMD_PACK_MAX_LEN ; i +=4 ) +sdhci_writel (host,0 ,SDHCI_UHS2_CMD_PACKET + i); + +DBG ("UHS2 CMD packet_len = %d.\n" , cmd->uhs2_cmd->packet_len); +for (i =0 ; i < cmd->uhs2_cmd->packet_len; i++) +DBG ("UHS2 CMD_PACKET[%d] = 0x%x.\n" , i, +sdhci_readb (host,SDHCI_UHS2_CMD_PACKET + i)); + + cmd_reg =FIELD_PREP (SDHCI_UHS2_CMD_PACK_LEN_MASK , cmd->uhs2_cmd->packet_len); +if ((cmd->flags &MMC_CMD_MASK ) ==MMC_CMD_ADTC ) + cmd_reg |=SDHCI_UHS2_CMD_DATA ; +if (cmd->opcode ==MMC_STOP_TRANSMISSION ) + cmd_reg |=SDHCI_UHS2_CMD_CMD12 ; + +/* UHS2 Native ABORT */ +if ((cmd->uhs2_cmd->header &UHS2_NATIVE_PACKET ) && + (uhs2_dev_cmd (cmd) ==UHS2_DEV_CMD_TRANS_ABORT )) + cmd_reg |=SDHCI_UHS2_CMD_TRNS_ABORT ; + +/* UHS2 Native DORMANT */ +if ((cmd->uhs2_cmd->header &UHS2_NATIVE_PACKET ) && + (uhs2_dev_cmd (cmd) ==UHS2_DEV_CMD_GO_DORMANT_STATE )) + cmd_reg |=SDHCI_UHS2_CMD_DORMANT ; + +DBG ("0x%x is set to UHS2 CMD register.\n" , cmd_reg); + +sdhci_writew (host, cmd_reg,SDHCI_UHS2_CMD ); +} + +static bool sdhci_uhs2_send_command (struct sdhci_host *host,struct mmc_command *cmd) +{ +int flags; +u32 mask; +unsigned long timeout; + +WARN_ON (host->cmd); + +/* Initially, a command has no error */ + cmd->error =0 ; + +if (cmd->opcode ==MMC_STOP_TRANSMISSION ) + cmd->flags |=MMC_RSP_BUSY ; + + mask =SDHCI_CMD_INHIBIT ; + +if (sdhci_readl (host,SDHCI_PRESENT_STATE ) & mask) +return false; + + host->cmd = cmd; + host->data_timeout =0 ; +if (sdhci_data_line_cmd (cmd)) { +WARN_ON (host->data_cmd); + host->data_cmd = cmd; +__sdhci_uhs2_set_timeout (host); + } + +if (cmd->data) +sdhci_uhs2_prepare_data (host, cmd); + +sdhci_uhs2_set_transfer_mode (host, cmd); + +if ((cmd->flags &MMC_RSP_136 ) && (cmd->flags &MMC_RSP_BUSY )) { +WARN_ONCE (1 ,"Unsupported response type!\n" ); +/* +* This does not happen in practice because 136-bit response +* commands never have busy waiting, so rather than complicate +* the error path, just remove busy waiting and continue. +*/ + cmd->flags &= ~MMC_RSP_BUSY ; + } + +if (!(cmd->flags &MMC_RSP_PRESENT )) + flags =SDHCI_CMD_RESP_NONE ; +else if (cmd->flags &MMC_RSP_136 ) + flags =SDHCI_CMD_RESP_LONG ; +else if (cmd->flags &MMC_RSP_BUSY ) + flags =SDHCI_CMD_RESP_SHORT_BUSY ; +else + flags =SDHCI_CMD_RESP_SHORT ; + +if (cmd->flags &MMC_RSP_CRC ) + flags |=SDHCI_CMD_CRC ; +if (cmd->flags &MMC_RSP_OPCODE ) + flags |=SDHCI_CMD_INDEX ; + + timeout = jiffies; +if (host->data_timeout) + timeout +=nsecs_to_jiffies (host->data_timeout); +else if (!cmd->data && cmd->busy_timeout >9000 ) + timeout +=DIV_ROUND_UP (cmd->busy_timeout,1000 ) *HZ +HZ ; +else + timeout +=10 *HZ ; +sdhci_mod_timer (host, cmd->mrq, timeout); + +__sdhci_uhs2_send_command (host, cmd); + +return true; +} + +static bool sdhci_uhs2_send_command_retry (struct sdhci_host *host, +struct mmc_command *cmd, +unsigned long flags) + __releases(host->lock) + __acquires(host->lock) +{ +struct mmc_command *deferred_cmd = host->deferred_cmd; +int timeout =10 ;/* Approx. 10 ms */ +bool present; + +while (!sdhci_uhs2_send_command (host, cmd)) { +if (!timeout--) { +pr_err ("%s: Controller never released inhibit bit(s).\n" , +mmc_hostname (host->mmc)); +sdhci_dumpregs (host); + cmd->error = -EIO ; +return false; + } + +spin_unlock_irqrestore (&host->lock, flags); + +usleep_range (1000 ,1250 ); + + present = host->mmc->ops->get_cd (host->mmc); + +spin_lock_irqsave (&host->lock, flags); + +/* A deferred command might disappear, handle that */ +if (cmd == deferred_cmd && cmd != host->deferred_cmd) +return true; + +if (sdhci_present_error (host, cmd, present)) +return false; + } + +if (cmd == host->deferred_cmd) + host->deferred_cmd =NULL ; + +return true; +} + +static void __sdhci_uhs2_finish_command (struct sdhci_host *host) +{ +struct mmc_command *cmd = host->cmd; +u8 resp; +u8 error_code; +bool breada0 =0 ; +int i; + +if (host->mmc->uhs2_sd_tran) { + resp =sdhci_readb (host,SDHCI_UHS2_RESPONSE +2 ); +if (resp &UHS2_RES_NACK_MASK ) { + error_code = (resp >>UHS2_RES_ECODE_POS ) &UHS2_RES_ECODE_MASK ; +pr_err ("%s: NACK response, ECODE=0x%x.\n" , +mmc_hostname (host->mmc), error_code); + } + breada0 =1 ; + } + +if (cmd->uhs2_cmd->uhs2_resp_len) { +int len =min_t (int, cmd->uhs2_cmd->uhs2_resp_len,UHS2_MAX_RESP_LEN ); + +/* Get whole response of some native CCMD, like +* DEVICE_INIT, ENUMERATE. +*/ +for (i =0 ; i < len; i++) + cmd->uhs2_cmd->uhs2_resp[i] =sdhci_readb (host,SDHCI_UHS2_RESPONSE + i); + }else { +/* Get SD CMD response and Payload for some read +* CCMD, like INQUIRY_CFG. +*/ +/* Per spec (p136), payload field is divided into +* a unit of DWORD and transmission order within +* a DWORD is big endian. +*/ +if (!breada0) +sdhci_readl (host,SDHCI_UHS2_RESPONSE ); +for (i =4 ; i <20 ; i +=4 ) { + cmd->resp[i /4 -1 ] = + (sdhci_readb (host, +SDHCI_UHS2_RESPONSE + i) <<24 ) | + (sdhci_readb (host, +SDHCI_UHS2_RESPONSE + i +1 ) + <<16 ) | + (sdhci_readb (host, +SDHCI_UHS2_RESPONSE + i +2 ) + <<8 ) | +sdhci_readb (host,SDHCI_UHS2_RESPONSE + i +3 ); + } + } +} + +static void sdhci_uhs2_finish_command (struct sdhci_host *host) +{ +struct mmc_command *cmd = host->cmd; + +__sdhci_uhs2_finish_command (host); + + host->cmd =NULL ; + +if (cmd->mrq->cap_cmd_during_tfr && cmd == cmd->mrq->cmd) +mmc_command_done (host->mmc, cmd->mrq); + +/* +* The host can send and interrupt when the busy state has +* ended, allowing us to wait without wasting CPU cycles. +* The busy signal uses DAT0 so this is similar to waiting +* for data to complete. +* +* Note: The 1.0 specification is a bit ambiguous about this +* feature so there might be some problems with older +* controllers. +*/ +if (cmd->flags &MMC_RSP_BUSY ) { +if (cmd->data) { +DBG ("Cannot wait for busy signal when also doing a data transfer" ); + }else if (!(host->quirks &SDHCI_QUIRK_NO_BUSY_IRQ ) && + cmd == host->data_cmd) { +/* Command complete before busy is ended */ +return ; + } + } + +/* Processed actual command. */ +if (host->data && host->data_early) +sdhci_uhs2_finish_data (host); + +if (!cmd->data) +__sdhci_finish_mrq (host, cmd->mrq); +} + +static void sdhci_uhs2_request (struct mmc_host *mmc,struct mmc_request *mrq) +{ +struct sdhci_host *host =mmc_priv (mmc); +struct mmc_command *cmd; +unsigned long flags; +bool present; + +if (!(mmc_card_uhs2 (mmc))) { +sdhci_request (mmc, mrq); +return ; + } + + mrq->stop =NULL ; + mrq->sbc =NULL ; +if (mrq->data) + mrq->data->stop =NULL ; + +/* Firstly check card presence */ + present = mmc->ops->get_cd (mmc); + +spin_lock_irqsave (&host->lock, flags); + +if (sdhci_present_error (host, mrq->cmd, present)) + goto out_finish; + + cmd = mrq->cmd; + +if (!sdhci_uhs2_send_command_retry (host, cmd, flags)) + goto out_finish; + +spin_unlock_irqrestore (&host->lock, flags); + +return ; + +out_finish: +sdhci_finish_mrq (host, mrq); +spin_unlock_irqrestore (&host->lock, flags); +} +/*****************************************************************************\ * * * Driver init/exit *
@@ -537,6 +914,7 @@ static int sdhci_uhs2_control(struct mmc_host *mmc, enum sd_uhs2_operation op)static int sdhci_uhs2_host_ops_init (struct sdhci_host *host) { host->mmc_host_ops.uhs2_control = sdhci_uhs2_control; + host->mmc_host_ops.request = sdhci_uhs2_request;return 0 ; }
drivers/mmc/host/sdhci.c +37 -16
142 lines not on this page · raw message
drivers/mmc/host/sdhci.h +8 -0
@@ -827,6 +827,14 @@ static inline void sdhci_read_caps(struct sdhci_host *host)__sdhci_read_caps (host,NULL ,NULL ,NULL ); } +bool sdhci_data_line_cmd (struct mmc_command *cmd); +void sdhci_mod_timer (struct sdhci_host *host,struct mmc_request *mrq,unsigned long timeout); +void sdhci_initialize_data (struct sdhci_host *host,struct mmc_data *data); +void sdhci_prepare_dma (struct sdhci_host *host,struct mmc_data *data); +void __sdhci_finish_mrq (struct sdhci_host *host,struct mmc_request *mrq); +void sdhci_finish_mrq (struct sdhci_host *host,struct mmc_request *mrq); +void __sdhci_finish_data_common (struct sdhci_host *host,bool defer_reset); +bool sdhci_present_error (struct sdhci_host *host,struct mmc_command *cmd,bool present);u16 sdhci_calc_clk (struct sdhci_host *host,unsigned int clock,unsigned int *actual_clock);void sdhci_set_clock (struct sdhci_host *host,unsigned int clock);
Signature · 1 line
2.25.1
PATCH v20 17/22 mmc: sdhci-uhs2: add irq() and others
In reply to Victor ShihFrom: Victor Shih <[email protected]>
This is a UHS-II version of sdhci's request() operation. It handles UHS-II related command interrupts and errors.
---
Updates in V19:
- Corrected sdhci_uhs2_reset() parameter errors in the sdhci_uhs2_request_done().
Updates in V18:
- Modify the judgment condition in the sdhci_uhs2_reset_cmd_data() and replace it from mmc_card_uhs2() to host->mmc->uhs2_sd_tran flag.
Updates in V17:
- Add sdhci_uhs2_reset_cmd_data() and sdhci_uhs2_needs_reset() to resolve the data error or cmd error.
Updates in V14:
- Use mmc_card_uhs2() to stead sdhci_uhs2_mode() in the sdhci_uhs2_complete_work(), sdhci_uhs2_irq() and sdhci_uhs2_thread_irq().
Updates in V13:
- Re-order function to avoid declaration.
- Remove unnecessary definitions.
Updates in V9:
- Cancel export state of sdhci_set_mrq_done() function.
Updates in V8:
- Forward declare struct mmc_request in sdhci_uhs2.h.
- Remove forward declaration of sdhci_send_command().
- Use mmc_dev() to simplify code in sdhci_request_done_dma().
Updates in V7:
- Remove unnecessary functions.
- Use sdhci_uhs2_mode() to simplify code in sdhci_uhs2_irq().
- Modify descriptions in sdhci_uhs2_irq().
- Cancel export state of some functions.
Updates in V6:
- Remove unnecessary functions.
- Add sdhci_uhs2_mode() in sdhci_uhs2_complete_work().
- Add sdhci_uhs2_mode() in sdhci_uhs2_thread_irq().
---
drivers/mmc/host/sdhci-uhs2.c | 237 ++++++++++++++++++++++++++++++++++ drivers/mmc/host/sdhci-uhs2.h | 2 + drivers/mmc/host/sdhci.c | 102 ++++++++------- drivers/mmc/host/sdhci.h | 5 + 4 files changed, 300 insertions(+), 46 deletions(-)
drivers/mmc/host/sdhci-uhs2.c +237 -0
@@ -106,6 +106,19 @@ void sdhci_uhs2_reset(struct sdhci_host *host, u16 mask) }EXPORT_SYMBOL_GPL (sdhci_uhs2_reset); +static void sdhci_uhs2_reset_cmd_data (struct sdhci_host *host) +{ +sdhci_do_reset (host,SDHCI_RESET_CMD |SDHCI_RESET_DATA ); + +if (host->mmc->uhs2_sd_tran) { +sdhci_uhs2_reset (host,SDHCI_UHS2_SW_RESET_SD ); + +sdhci_writel (host, host->ier,SDHCI_INT_ENABLE ); +sdhci_writel (host, host->ier,SDHCI_SIGNAL_ENABLE ); +sdhci_uhs2_clear_set_irqs (host,SDHCI_INT_ALL_MASK ,SDHCI_UHS2_INT_ERROR_MASK ); + } +} +void sdhci_uhs2_set_power (struct sdhci_host *host,unsigned char mode,unsigned short vdd) {struct mmc_host *mmc = host->mmc;
@@ -905,6 +918,230 @@ static void sdhci_uhs2_request(struct mmc_host *mmc, struct mmc_request *mrq)spin_unlock_irqrestore (&host->lock, flags); } +/*****************************************************************************\ +* * +* Request done * +* * +\*****************************************************************************/ + +static bool sdhci_uhs2_needs_reset (struct sdhci_host *host,struct mmc_request *mrq) +{ +return sdhci_needs_reset (host, mrq) || + (!(host->flags &SDHCI_DEVICE_DEAD ) && mrq->data && mrq->data->error); +} + +static bool sdhci_uhs2_request_done (struct sdhci_host *host) +{ +unsigned long flags; +struct mmc_request *mrq; +int i; + +spin_lock_irqsave (&host->lock, flags); + +for (i =0 ; i <SDHCI_MAX_MRQS ; i++) { + mrq = host->mrqs_done[i]; +if (mrq) +break ; + } + +if (!mrq) { +spin_unlock_irqrestore (&host->lock, flags); +return true; + } + +/* +* Always unmap the data buffers if they were mapped by +* sdhci_prepare_data() whenever we finish with a request. +* This avoids leaking DMA mappings on error. +*/ +if (host->flags &SDHCI_REQ_USE_DMA ) +sdhci_request_done_dma (host, mrq); + +/* +* The controller needs a reset of internal state machines +* upon error conditions. +*/ +if (sdhci_uhs2_needs_reset (host, mrq)) { +/* +* Do not finish until command and data lines are available for +* reset. Note there can only be one other mrq, so it cannot +* also be in mrqs_done, otherwise host->cmd and host->data_cmd +* would both be null. +*/ +if (host->cmd || host->data_cmd) { +spin_unlock_irqrestore (&host->lock, flags); +return true; + } + +if (mrq->cmd->error || mrq->data->error) +sdhci_uhs2_reset_cmd_data (host); +else +sdhci_uhs2_reset (host,SDHCI_UHS2_SW_RESET_SD ); + host->pending_reset = false; + } + + host->mrqs_done[i] =NULL ; + +spin_unlock_irqrestore (&host->lock, flags); + +if (host->ops->request_done) + host->ops->request_done (host, mrq); +else +mmc_request_done (host->mmc, mrq); + +return false; +} + +static void sdhci_uhs2_complete_work (struct work_struct *work) +{ + struct sdhci_host *host = container_of(work, struct sdhci_host, + complete_work); + +if (!mmc_card_uhs2 (host->mmc)) { +sdhci_complete_work (work); +return ; + } + +while (!sdhci_uhs2_request_done (host)) + ; +} + +/*****************************************************************************\ +* * +* Interrupt handling * +* * +\*****************************************************************************/ + +static void __sdhci_uhs2_irq (struct sdhci_host *host,u32 uhs2mask) +{ +struct mmc_command *cmd = host->cmd; + +DBG ("*** %s got UHS2 error interrupt: 0x%08x\n" , +mmc_hostname (host->mmc), uhs2mask); + +if (uhs2mask &SDHCI_UHS2_INT_CMD_ERR_MASK ) { +if (!host->cmd) { +pr_err ("%s: Got cmd interrupt 0x%08x but no cmd.\n" , +mmc_hostname (host->mmc), + (unsigned int )uhs2mask); +sdhci_dumpregs (host); +return ; + } + host->cmd->error = -EILSEQ ; +if (uhs2mask &SDHCI_UHS2_INT_CMD_TIMEOUT ) + host->cmd->error = -ETIMEDOUT ; + } + +if (uhs2mask &SDHCI_UHS2_INT_DATA_ERR_MASK ) { +if (!host->data) { +pr_err ("%s: Got data interrupt 0x%08x but no data.\n" , +mmc_hostname (host->mmc), + (unsigned int )uhs2mask); +sdhci_dumpregs (host); +return ; + } + +if (uhs2mask &SDHCI_UHS2_INT_DEADLOCK_TIMEOUT ) { +pr_err ("%s: Got deadlock timeout interrupt 0x%08x\n" , +mmc_hostname (host->mmc), + (unsigned int )uhs2mask); + host->data->error = -ETIMEDOUT ; + }else if (uhs2mask &SDHCI_UHS2_INT_ADMA_ERROR ) { +pr_err ("%s: ADMA error = 0x %x\n" , +mmc_hostname (host->mmc), +sdhci_readb (host,SDHCI_ADMA_ERROR )); + host->data->error = -EIO ; + }else { + host->data->error = -EILSEQ ; + } + } + +if (host->data && host->data->error) +sdhci_uhs2_finish_data (host); +else +sdhci_finish_mrq (host, cmd->mrq); +} + +u32 sdhci_uhs2_irq (struct sdhci_host *host,u32 intmask) +{ +u32 mask = intmask, uhs2mask; + +if (!mmc_card_uhs2 (host->mmc)) + goto out; + +if (intmask &SDHCI_INT_ERROR ) { + uhs2mask =sdhci_readl (host,SDHCI_UHS2_INT_STATUS ); +if (!(uhs2mask &SDHCI_UHS2_INT_ERROR_MASK )) + goto cmd_irq; + +/* Clear error interrupts */ +sdhci_writel (host, uhs2mask &SDHCI_UHS2_INT_ERROR_MASK , +SDHCI_UHS2_INT_STATUS ); + +/* Handle error interrupts */ +__sdhci_uhs2_irq (host, uhs2mask); + +/* Caller, sdhci_irq(), doesn't have to care about UHS-2 errors */ + intmask &= ~SDHCI_INT_ERROR ; + mask &=SDHCI_INT_ERROR ; + } + +cmd_irq: +if (intmask &SDHCI_INT_CMD_MASK ) { +/* Clear command interrupt */ +sdhci_writel (host, intmask &SDHCI_INT_CMD_MASK ,SDHCI_INT_STATUS ); + +/* Handle command interrupt */ +if (intmask &SDHCI_INT_RESPONSE ) +sdhci_uhs2_finish_command (host); + +/* Caller, sdhci_irq(), doesn't have to care about UHS-2 commands */ + intmask &= ~SDHCI_INT_CMD_MASK ; + mask &=SDHCI_INT_CMD_MASK ; + } + +/* Clear already-handled interrupts. */ +sdhci_writel (host, mask,SDHCI_INT_STATUS ); + +out: +return intmask; +} +EXPORT_SYMBOL_GPL (sdhci_uhs2_irq); + +static irqreturn_t sdhci_uhs2_thread_irq (int irq,void *dev_id) +{ +struct sdhci_host *host = dev_id; +struct mmc_command *cmd; +unsigned long flags; +u32 isr; + +if (!mmc_card_uhs2 (host->mmc)) +return sdhci_thread_irq (irq, dev_id); + +while (!sdhci_uhs2_request_done (host)) + ; + +spin_lock_irqsave (&host->lock, flags); + + isr = host->thread_isr; + host->thread_isr =0 ; + + cmd = host->deferred_cmd; +if (cmd && !sdhci_uhs2_send_command_retry (host, cmd, flags)) +sdhci_finish_mrq (host, cmd->mrq); + +spin_unlock_irqrestore (&host->lock, flags); + +if (isr & (SDHCI_INT_CARD_INSERT |SDHCI_INT_CARD_REMOVE )) { +struct mmc_host *mmc = host->mmc; + + mmc->ops->card_event (mmc); +mmc_detect_change (mmc,msecs_to_jiffies (200 )); + } + +return IRQ_HANDLED ; +} +/*****************************************************************************\ * * * Driver init/exit *
drivers/mmc/host/sdhci-uhs2.h +2 -0
@@ -176,11 +176,13 @@struct sdhci_host ;struct mmc_command ; +struct mmc_request ;void sdhci_uhs2_dump_regs (struct sdhci_host *host);void sdhci_uhs2_reset (struct sdhci_host *host,u16 mask);void sdhci_uhs2_set_power (struct sdhci_host *host,unsigned char mode,unsigned short vdd);void sdhci_uhs2_set_timeout (struct sdhci_host *host,struct mmc_command *cmd);void sdhci_uhs2_clear_set_irqs (struct sdhci_host *host,u32 clear,u32 set); +u32 sdhci_uhs2_irq (struct sdhci_host *host,u32 intmask);#endif /* __SDHCI_UHS2_H */
drivers/mmc/host/sdhci.c +56 -46
162 lines not on this page · raw message
drivers/mmc/host/sdhci.h +5 -0
@@ -831,6 +831,7 @@ bool sdhci_data_line_cmd(struct mmc_command *cmd);void sdhci_mod_timer (struct sdhci_host *host,struct mmc_request *mrq,unsigned long timeout);void sdhci_initialize_data (struct sdhci_host *host,struct mmc_data *data);void sdhci_prepare_dma (struct sdhci_host *host,struct mmc_data *data); +bool sdhci_needs_reset (struct sdhci_host *host,struct mmc_request *mrq);void __sdhci_finish_mrq (struct sdhci_host *host,struct mmc_request *mrq);void sdhci_finish_mrq (struct sdhci_host *host,struct mmc_request *mrq);void __sdhci_finish_data_common (struct sdhci_host *host,bool defer_reset);
@@ -853,6 +854,7 @@ void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq);int sdhci_request_atomic (struct mmc_host *mmc,struct mmc_request *mrq);void sdhci_set_bus_width (struct sdhci_host *host,int width);void sdhci_reset (struct sdhci_host *host,u8 mask); +bool sdhci_do_reset (struct sdhci_host *host,u8 mask);void sdhci_set_uhs_signaling (struct sdhci_host *host,unsigned timing);int sdhci_execute_tuning (struct mmc_host *mmc,u32 opcode);int __sdhci_execute_tuning (struct sdhci_host *host,u32 opcode);
@@ -862,6 +864,9 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios);int sdhci_start_signal_voltage_switch (struct mmc_host *mmc,struct mmc_ios *ios);void sdhci_enable_sdio_irq (struct mmc_host *mmc,int enable); +void sdhci_request_done_dma (struct sdhci_host *host,struct mmc_request *mrq); +void sdhci_complete_work (struct work_struct *work); +irqreturn_t sdhci_thread_irq (int irq,void *dev_id);void sdhci_adma_write_desc (struct sdhci_host *host,void **desc,dma_addr_t addr,int len,unsigned int cmd);
Signature · 1 line
2.25.1
PATCH v20 18/22 mmc: sdhci-uhs2: add add_host() and others to set up the driver
In reply to Victor ShihFrom: Victor Shih <[email protected]>
This is a UHS-II version of sdhci's add_host/remove_host operation. Any sdhci drivers which are capable of handling UHS-II cards must call those functions instead of the corresponding sdhci's.
---
Updates in V14:
- Use mmc_card_uhs2() to stead sdhci_uhs2_mode() in the __sdhci_uhs2_remove_host().
Updates in V13:
- Re-order function to avoid declaration.
- Use vqmmc2 to stead vmmc2.
Updates in V11:
- Remove unused ocr_avail_uhs2.
Updates in V10:
- Move some definitions of PatchV9[05/23] to PatchV10[20/23].
Updates in V8:
- Change return type to void for __sdhci_uhs2_add_host_v4().
- Remove unused variables in __sdhci_uhs2_add_host_v4().
Updates in V7:
- __sdhci_add_host() to instead of __sdhci_uhs2_add_host() in sdhci_uhs2_add_host().
- Cancel export state of some functions.
Updates in V6:
- Add complete_work_fn/thread_irq_fn variables in struct sdhci_host.
- Use complete_work_fn/thread_irq_fn variables in sdhci_alloc_host() and sdhci_uhs2_add_host().
- Use sdhci_uhs2_mode() to simplify code in __sdhci_uhs2_remove_host().
---
drivers/mmc/host/sdhci-uhs2.c | 98 +++++++++++++++++++++++++++++++++++ drivers/mmc/host/sdhci-uhs2.h | 2 + drivers/mmc/host/sdhci.c | 7 ++- drivers/mmc/host/sdhci.h | 3 ++ 4 files changed, 108 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-uhs2.c +98 -0
@@ -16,6 +16,7 @@#include <linux/bitfield.h> #include <linux/mmc/mmc.h> #include <linux/mmc/host.h> +#include <linux/regulator/consumer.h> #include "sdhci.h" #include "sdhci-uhs2.h"
@@ -1167,6 +1168,103 @@ static void __exit sdhci_uhs2_mod_exit(void) }module_exit (sdhci_uhs2_mod_exit); +/*****************************************************************************\ +* +* Device allocation/registration * +* * +\*****************************************************************************/ + +static void __sdhci_uhs2_add_host_v4 (struct sdhci_host *host,u32 caps1) +{ +struct mmc_host *mmc; +u32 max_current_caps2; + + mmc = host->mmc; + +/* Support UHS2 */ +if (caps1 &SDHCI_SUPPORT_UHS2 ) + mmc->caps2 |=MMC_CAP2_SD_UHS2 ; + + max_current_caps2 =sdhci_readl (host,SDHCI_MAX_CURRENT_1 ); + +if ((caps1 &SDHCI_CAN_VDD2_180 ) && + !max_current_caps2 && + !IS_ERR (mmc->supply.vqmmc2)) { +/* UHS2 - VDD2 */ +int curr =regulator_get_current_limit (mmc->supply.vqmmc2); + +if (curr >0 ) { +/* convert to SDHCI_MAX_CURRENT format */ + curr = curr /1000 ;/* convert to mA */ + curr = curr /SDHCI_MAX_CURRENT_MULTIPLIER ; + curr =min_t (u32, curr,SDHCI_MAX_CURRENT_LIMIT ); + max_current_caps2 = curr; + } + } + +if (!(caps1 &SDHCI_CAN_VDD2_180 )) + mmc->caps2 &= ~MMC_CAP2_SD_UHS2 ; +} + +static void __sdhci_uhs2_remove_host (struct sdhci_host *host,int dead) +{ +if (!mmc_card_uhs2 (host->mmc)) +return ; + +if (!dead) +sdhci_uhs2_reset (host,SDHCI_UHS2_SW_RESET_FULL ); +} + +int sdhci_uhs2_add_host (struct sdhci_host *host) +{ +struct mmc_host *mmc = host->mmc; +int ret; + + ret =sdhci_setup_host (host); +if (ret) +return ret; + +if (host->version >=SDHCI_SPEC_400 ) +__sdhci_uhs2_add_host_v4 (host, host->caps1); + +if ((mmc->caps2 &MMC_CAP2_SD_UHS2 ) && !host->v4_mode) +/* host doesn't want to enable UHS2 support */ + mmc->caps2 &= ~MMC_CAP2_SD_UHS2 ; + +/* overwrite ops */ +if (mmc->caps2 &MMC_CAP2_SD_UHS2 ) +sdhci_uhs2_host_ops_init (host); + + host->complete_work_fn = sdhci_uhs2_complete_work; + host->thread_irq_fn = sdhci_uhs2_thread_irq; + +/* LED support not implemented for UHS2 */ + host->quirks |=SDHCI_QUIRK_NO_LED ; + + ret =__sdhci_add_host (host); +if (ret) + goto cleanup; + +return 0 ; + +cleanup: +if (host->version >=SDHCI_SPEC_400 ) +__sdhci_uhs2_remove_host (host,0 ); + +sdhci_cleanup_host (host); + +return ret; +} +EXPORT_SYMBOL_GPL (sdhci_uhs2_add_host); + +void sdhci_uhs2_remove_host (struct sdhci_host *host,int dead) +{ +__sdhci_uhs2_remove_host (host, dead); + +sdhci_remove_host (host, dead); +} +EXPORT_SYMBOL_GPL (sdhci_uhs2_remove_host); +MODULE_AUTHOR ("Intel, Genesys Logic, Linaro" );MODULE_DESCRIPTION ("MMC UHS-II Support" );MODULE_LICENSE ("GPL" );
drivers/mmc/host/sdhci-uhs2.h +2 -0
@@ -184,5 +184,7 @@ void sdhci_uhs2_set_power(struct sdhci_host *host, unsigned char mode, unsignedvoid sdhci_uhs2_set_timeout (struct sdhci_host *host,struct mmc_command *cmd);void sdhci_uhs2_clear_set_irqs (struct sdhci_host *host,u32 clear,u32 set);u32 sdhci_uhs2_irq (struct sdhci_host *host,u32 intmask); +int sdhci_uhs2_add_host (struct sdhci_host *host); +void sdhci_uhs2_remove_host (struct sdhci_host *host,int dead);#endif /* __SDHCI_UHS2_H */
drivers/mmc/host/sdhci.c +5 -2
@@ -4098,6 +4098,9 @@ struct sdhci_host *sdhci_alloc_host(struct device *dev, host->max_timeout_count =0xE ; + host->complete_work_fn = sdhci_complete_work; + host->thread_irq_fn = sdhci_thread_irq; +return host; }
@@ -4862,7 +4865,7 @@ int __sdhci_add_host(struct sdhci_host *host)if (!host->complete_wq)return -ENOMEM ; -INIT_WORK (&host->complete_work, sdhci_complete_work); +INIT_WORK (&host->complete_work, host->complete_work_fn);timer_setup (&host->timer, sdhci_timeout_timer,0 );timer_setup (&host->data_timer, sdhci_timeout_data_timer,0 );
@@ -4871,7 +4874,7 @@ int __sdhci_add_host(struct sdhci_host *host)sdhci_init (host,0 ); - ret =request_threaded_irq (host->irq, sdhci_irq, sdhci_thread_irq, + ret =request_threaded_irq (host->irq, sdhci_irq, host->thread_irq_fn,IRQF_SHARED ,mmc_hostname (mmc), host);if (ret) { pr_err("%s: Failed to request IRQ %d: %d\n",
drivers/mmc/host/sdhci.h +3 -0
@@ -625,6 +625,9 @@ struct sdhci_host {struct timer_list timer;/* Timer for timeouts */ struct timer_list data_timer;/* Timer for data timeouts */ +void (*complete_work_fn)(struct work_struct *work); +irqreturn_t (*thread_irq_fn)(int irq,void *dev_id); +#if IS_ENABLED (CONFIG_MMC_SDHCI_EXTERNAL_DMA )struct dma_chan *rx_chan;struct dma_chan *tx_chan;
Signature · 1 line
2.25.1
PATCH v20 19/22 mmc: sdhci-uhs2: add pre-detect_init hook
In reply to Victor ShihFrom: Ben Chuang <[email protected]>
This "pre" hook for detect_init(), uhs2_pre_detect_init, will be required to enable UHS-II support, at least, on GL9755.
--- drivers/mmc/host/sdhci-uhs2.c | 3 +++ drivers/mmc/host/sdhci.h | 1 + 2 files changed, 4 insertions(+)
drivers/mmc/host/sdhci-uhs2.c +3 -0
@@ -413,6 +413,9 @@ static int sdhci_uhs2_do_detect_init(struct mmc_host *mmc)DBG ("Begin do uhs2 detect init.\n" ); +if (host->ops && host->ops->uhs2_pre_detect_init) + host->ops->uhs2_pre_detect_init (host); +if (sdhci_uhs2_interface_detect (host)) {pr_warn ("%s: cannot detect UHS2 interface.\n" ,mmc_hostname (host->mmc));return -EIO ;
drivers/mmc/host/sdhci.h +1 -0
@@ -723,6 +723,7 @@ struct sdhci_ops { struct mmc_request *mrq);void (*dump_vendor_regs)(struct sdhci_host *host);void (*dump_uhs2_regs)(struct sdhci_host *host); +void (*uhs2_pre_detect_init)(struct sdhci_host *host); };#ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
Signature · 1 line
2.25.1
PATCH v20 20/22 mmc: sdhci-pci: add UHS-II support framework
In reply to Victor ShihFrom: Victor Shih <[email protected]>
This patch prepares for adding UHS-II support at a specific UHS-II capable sdhci-pci controller, GL9755 for now.
---
Updates in V8:
- Add config select MMC_SDHCI_UHS2 in Kconfig.
---
drivers/mmc/host/Kconfig | 1 + drivers/mmc/host/sdhci-pci-core.c | 16 +++++++++++++++- drivers/mmc/host/sdhci-pci.h | 3 +++ 3 files changed, 19 insertions(+), 1 deletion(-)
drivers/mmc/host/Kconfig +1 -0
@@ -111,6 +111,7 @@ config MMC_SDHCI_PCI tristate "SDHCI support on PCI bus" depends on MMC_SDHCI && PCI select MMC_CQHCI + select MMC_SDHCI_UHS2 select IOSF_MBI if X86 select MMC_SDHCI_IO_ACCESSORS help
drivers/mmc/host/sdhci-pci-core.c +15 -1
@@ -40,6 +40,7 @@#include "sdhci.h" #include "sdhci-cqhci.h" #include "sdhci-pci.h" +#include "sdhci-uhs2.h" static void sdhci_pci_hw_reset (struct sdhci_host *host);
@@ -2181,7 +2182,10 @@ static void sdhci_pci_remove_slot(struct sdhci_pci_slot *slot)if (scratch == (u32)-1 ) dead =1 ; -sdhci_remove_host (slot->host, dead); +if (slot->chip->fixes && slot->chip->fixes->remove_host) + slot->chip->fixes->remove_host (slot, dead); +else +sdhci_remove_host (slot->host, dead);if (slot->chip->fixes && slot->chip->fixes->remove_slot) slot->chip->fixes->remove_slot (slot, dead);
@@ -2189,6 +2193,16 @@ static void sdhci_pci_remove_slot(struct sdhci_pci_slot *slot)sdhci_free_host (slot->host); } +int sdhci_pci_uhs2_add_host (struct sdhci_pci_slot *slot) +{ +return sdhci_uhs2_add_host (slot->host); +} + +void sdhci_pci_uhs2_remove_host (struct sdhci_pci_slot *slot,int dead) +{ +sdhci_uhs2_remove_host (slot->host, dead); +} +static void sdhci_pci_runtime_pm_allow (struct device *dev) {pm_suspend_ignore_children (dev,1 );
drivers/mmc/host/sdhci-pci.h +3 -0
@@ -145,6 +145,7 @@ struct sdhci_pci_fixes {int (*probe_slot) (struct sdhci_pci_slot *);int (*add_host) (struct sdhci_pci_slot *);void (*remove_slot) (struct sdhci_pci_slot *,int ); +void (*remove_host) (struct sdhci_pci_slot *,int );#ifdef CONFIG_PM_SLEEP int (*suspend) (struct sdhci_pci_chip *);
@@ -189,6 +190,8 @@ static inline void *sdhci_pci_priv(struct sdhci_pci_slot *slot)return (void *)slot->private; } +int sdhci_pci_uhs2_add_host (struct sdhci_pci_slot *slot); +void sdhci_pci_uhs2_remove_host (struct sdhci_pci_slot *slot,int dead);#ifdef CONFIG_PM_SLEEP int sdhci_pci_resume_host (struct sdhci_pci_chip *chip);#endif
Signature · 1 line
2.25.1
PATCH v20 21/22 mmc: sdhci-pci-gli: enable UHS-II mode for GL9755
In reply to Victor ShihFrom: Victor Shih <[email protected]>
Changes are:
* Disable GL9755 overcurrent interrupt when power on/off on UHS-II.
* Enable the internal clock when do reset on UHS-II mode.
* Increase timeout value before detecting UHS-II interface.
* Add vendor settings fro UHS-II mode.
* Remove sdhci_gli_enable_internal_clock functon unused clk_ctrl variable.
* Make a function sdhci_gli_wait_software_reset_done() for gl9755 reset.
---
Updates in V20:
- Remove sdhci_gli_enable_internal_clock functon unused clk_ctrl variable.
- Make a function sdhci_gli_wait_software_reset_done() for gl9755 reset.
Updates in V19:
- Add sdhci_gli_enable_internal_clock() to simplify the code in the sdhci_gl9755_reset().
Updates in V17:
- Rname gl9755_overcurrent_event_enable() to
sdhci_gli_overcurrent_event_enable().
Updates in V15:
- Adjust gl9755_vendor_init() to the correct function.
Updates in V13:
- Ues uhs2_sd_tran to stead MMC_UHS2_SD_TRAN.
Updates in V9:
- Rename gl9755_pre_detect_init() to sdhci_gli_pre_detect_init().
- Rename gl9755_uhs2_reset_sd_tran() to sdhci_gli_uhs2_reset_sd_tran().
Updates in V8:
- Use sdhci_get_vdd_value() to simplify code in gl9755_set_power().
- Use read_poll_timeout_atomic() to simplify code in sdhci_wait_clock_stable().
- Use read_poll_timeout_atomic() to simplify code in sdhci_gl9755_reset().
Updates in V7:
- Drop using gl9755_post_attach_sd().
---
drivers/mmc/host/sdhci-pci-gli.c | 236 ++++++++++++++++++++++++++++++- 1 file changed, 235 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-pci-gli.c +235 -1
@@ -18,6 +18,7 @@#include "sdhci-cqhci.h" #include "sdhci-pci.h" #include "cqhci.h" +#include "sdhci-uhs2.h" /* Genesys Logic extra registers */ #define SDHCI_GLI_9750_WT 0x800
@@ -139,9 +140,36 @@#define PCI_GLI_9755_PLLSSC 0x68#define PCI_GLI_9755_PLLSSC_PPM GENMASK(15, 0) +#define PCI_GLI_9755_PLLSSC_RTL BIT(24) +#define GLI_9755_PLLSSC_RTL_VALUE 0x1 +#define PCI_GLI_9755_PLLSSC_TRANS_PASS BIT(27) +#define GLI_9755_PLLSSC_TRANS_PASS_VALUE 0x1 +#define PCI_GLI_9755_PLLSSC_RECV GENMASK(29, 28) +#define GLI_9755_PLLSSC_RECV_VALUE 0x0 +#define PCI_GLI_9755_PLLSSC_TRAN GENMASK(31, 30) +#define GLI_9755_PLLSSC_TRAN_VALUE 0x3 + +#define PCI_GLI_9755_UHS2_PLL 0x6C +#define PCI_GLI_9755_UHS2_PLL_SSC GENMASK(9, 8) +#define GLI_9755_UHS2_PLL_SSC_VALUE 0x0 +#define PCI_GLI_9755_UHS2_PLL_DELAY BIT(18) +#define GLI_9755_UHS2_PLL_DELAY_VALUE 0x1 +#define PCI_GLI_9755_UHS2_PLL_PDRST BIT(27) +#define GLI_9755_UHS2_PLL_PDRST_VALUE 0x1#define PCI_GLI_9755_SerDes 0x70 +#define PCI_GLI_9755_UHS2_SERDES_INTR GENMASK(2, 0) +#define GLI_9755_UHS2_SERDES_INTR_VALUE 0x3 +#define PCI_GLI_9755_UHS2_SERDES_ZC1 BIT(3) +#define GLI_9755_UHS2_SERDES_ZC1_VALUE 0x0 +#define PCI_GLI_9755_UHS2_SERDES_ZC2 GENMASK(7, 4) +#define GLI_9755_UHS2_SERDES_ZC2_DEFAULT 0xB +#define GLI_9755_UHS2_SERDES_ZC2_SANDISK 0x0#define PCI_GLI_9755_SCP_DIS BIT(19) +#define PCI_GLI_9755_UHS2_SERDES_TRAN GENMASK(27, 24) +#define GLI_9755_UHS2_SERDES_TRAN_VALUE 0xC +#define PCI_GLI_9755_UHS2_SERDES_RECV GENMASK(31, 28) +#define GLI_9755_UHS2_SERDES_RECV_VALUE 0xF#define PCI_GLI_9755_MISC 0x78#define PCI_GLI_9755_MISC_SSC_OFF BIT(26)
@@ -779,6 +807,204 @@ static void gl9755_hw_setting(struct sdhci_pci_slot *slot)gl9755_wt_off (pdev); } +static void gl9755_vendor_init (struct sdhci_host *host) +{ +struct sdhci_pci_slot *slot =sdhci_priv (host); +struct pci_dev *pdev = slot->chip->pdev; +u32 serdes; +u32 pllssc; +u32 uhs2_pll; + +gl9755_wt_on (pdev); + +pci_read_config_dword (pdev, PCI_GLI_9755_SerDes, &serdes); + serdes &= ~PCI_GLI_9755_UHS2_SERDES_TRAN ; + serdes |=FIELD_PREP (PCI_GLI_9755_UHS2_SERDES_TRAN , +GLI_9755_UHS2_SERDES_TRAN_VALUE ); + serdes &= ~PCI_GLI_9755_UHS2_SERDES_RECV ; + serdes |=FIELD_PREP (PCI_GLI_9755_UHS2_SERDES_RECV , +GLI_9755_UHS2_SERDES_RECV_VALUE ); + serdes &= ~PCI_GLI_9755_UHS2_SERDES_INTR ; + serdes |=FIELD_PREP (PCI_GLI_9755_UHS2_SERDES_INTR , +GLI_9755_UHS2_SERDES_INTR_VALUE ); + serdes &= ~PCI_GLI_9755_UHS2_SERDES_ZC1 ; + serdes |=FIELD_PREP (PCI_GLI_9755_UHS2_SERDES_ZC1 , +GLI_9755_UHS2_SERDES_ZC1_VALUE ); + serdes &= ~PCI_GLI_9755_UHS2_SERDES_ZC2 ; + serdes |=FIELD_PREP (PCI_GLI_9755_UHS2_SERDES_ZC2 , +GLI_9755_UHS2_SERDES_ZC2_DEFAULT ); +pci_write_config_dword (pdev, PCI_GLI_9755_SerDes, serdes); + +pci_read_config_dword (pdev,PCI_GLI_9755_UHS2_PLL , &uhs2_pll); + uhs2_pll &= ~PCI_GLI_9755_UHS2_PLL_SSC ; + uhs2_pll |=FIELD_PREP (PCI_GLI_9755_UHS2_PLL_SSC , +GLI_9755_UHS2_PLL_SSC_VALUE ); + uhs2_pll &= ~PCI_GLI_9755_UHS2_PLL_DELAY ; + uhs2_pll |=FIELD_PREP (PCI_GLI_9755_UHS2_PLL_DELAY , +GLI_9755_UHS2_PLL_DELAY_VALUE ); + uhs2_pll &= ~PCI_GLI_9755_UHS2_PLL_PDRST ; + uhs2_pll |=FIELD_PREP (PCI_GLI_9755_UHS2_PLL_PDRST , +GLI_9755_UHS2_PLL_PDRST_VALUE ); +pci_write_config_dword (pdev,PCI_GLI_9755_UHS2_PLL , uhs2_pll); + +pci_read_config_dword (pdev,PCI_GLI_9755_PLLSSC , &pllssc); + pllssc &= ~PCI_GLI_9755_PLLSSC_RTL ; + pllssc |=FIELD_PREP (PCI_GLI_9755_PLLSSC_RTL , +GLI_9755_PLLSSC_RTL_VALUE ); + pllssc &= ~PCI_GLI_9755_PLLSSC_TRANS_PASS ; + pllssc |=FIELD_PREP (PCI_GLI_9755_PLLSSC_TRANS_PASS , +GLI_9755_PLLSSC_TRANS_PASS_VALUE ); + pllssc &= ~PCI_GLI_9755_PLLSSC_RECV ; + pllssc |=FIELD_PREP (PCI_GLI_9755_PLLSSC_RECV , +GLI_9755_PLLSSC_RECV_VALUE ); + pllssc &= ~PCI_GLI_9755_PLLSSC_TRAN ; + pllssc |=FIELD_PREP (PCI_GLI_9755_PLLSSC_TRAN , +GLI_9755_PLLSSC_TRAN_VALUE ); +pci_write_config_dword (pdev,PCI_GLI_9755_PLLSSC , pllssc); + +gl9755_wt_off (pdev); +} + +static void sdhci_gli_pre_detect_init (struct sdhci_host *host) +{ +/* Need more time on UHS2 detect flow */ +sdhci_writeb (host,0xA7 ,SDHCI_UHS2_TIMER_CTRL ); +} + +static void sdhci_gli_overcurrent_event_enable (struct sdhci_host *host,bool enable) +{ +u32 mask; + + mask =sdhci_readl (host,SDHCI_SIGNAL_ENABLE ); +if (enable) + mask |=SDHCI_INT_BUS_POWER ; +else + mask &= ~SDHCI_INT_BUS_POWER ; + +sdhci_writel (host, mask,SDHCI_SIGNAL_ENABLE ); + + mask =sdhci_readl (host,SDHCI_INT_ENABLE ); +if (enable) + mask |=SDHCI_INT_BUS_POWER ; +else + mask &= ~SDHCI_INT_BUS_POWER ; + +sdhci_writel (host, mask,SDHCI_INT_ENABLE ); +} + +static void gl9755_set_power (struct sdhci_host *host,unsigned char mode, +unsigned short vdd) +{ +u8 pwr =0 ; + +if (mode !=MMC_POWER_OFF ) { + pwr =sdhci_get_vdd_value (vdd); +if (!pwr) +WARN (1 ,"%s: Invalid vdd %#x\n" ,mmc_hostname (host->mmc), vdd); + pwr |=SDHCI_VDD2_POWER_180 ; + } + +if (host->pwr == pwr) +return ; + + host->pwr = pwr; + +if (pwr ==0 ) { +sdhci_gli_overcurrent_event_enable (host, false); +sdhci_writeb (host,0 ,SDHCI_POWER_CONTROL ); + }else { +sdhci_gli_overcurrent_event_enable (host, false); +sdhci_writeb (host,0 ,SDHCI_POWER_CONTROL ); + + pwr |= (SDHCI_POWER_ON |SDHCI_VDD2_POWER_ON ); + +sdhci_writeb (host, pwr &0xf ,SDHCI_POWER_CONTROL ); +/* wait stable */ +mdelay (5 ); +sdhci_writeb (host, pwr,SDHCI_POWER_CONTROL ); +/* wait stable */ +mdelay (5 ); +sdhci_gli_overcurrent_event_enable (host, true); + } +} + +static bool sdhci_wait_clock_stable (struct sdhci_host *host) +{ +u16 clk =0 ; + +if (read_poll_timeout_atomic (sdhci_readw, clk, (clk &SDHCI_CLOCK_INT_STABLE ), +10 ,20000 , false, host,SDHCI_CLOCK_CONTROL )) { +pr_err ("%s: Internal clock never stabilised.\n" ,mmc_hostname (host->mmc)); +sdhci_dumpregs (host); +return false; + } +return true; +} + +static void sdhci_gli_enable_internal_clock (struct sdhci_host *host) +{ +u16 ctrl2; + + ctrl2 =sdhci_readw (host,SDHCI_HOST_CONTROL2 ); + +sdhci_writew (host,SDHCI_CLOCK_INT_EN ,SDHCI_CLOCK_CONTROL ); + +if (!((ctrl2 &SDHCI_CTRL_V4_MODE ) && + (ctrl2 &SDHCI_CTRL_UHS2_ENABLE ))) { +sdhci_wait_clock_stable (host); +sdhci_writew (host,SDHCI_CTRL_V4_MODE ,SDHCI_HOST_CONTROL2 ); + } +} + +static int sdhci_gli_wait_software_reset_done (struct sdhci_host *host,u8 mask) +{ +u8 rst; + +/* hw clears the bit when it's done */ +if (read_poll_timeout_atomic (sdhci_readb, rst, !(rst & mask), +10 ,100000 , false, host,SDHCI_SOFTWARE_RESET )) { +pr_err ("%s: Reset 0x%x never completed.\n" ,mmc_hostname (host->mmc), (int )mask); +sdhci_dumpregs (host); +/* manual clear */ +sdhci_writeb (host,0 ,SDHCI_SOFTWARE_RESET ); +return -ETIMEDOUT ; + } + +return 0 ; +} + +static void sdhci_gli_uhs2_reset_sd_tran (struct sdhci_host *host) +{ +/* do this on UHS2 mode */ +if (host->mmc->uhs2_sd_tran) { +sdhci_uhs2_reset (host,SDHCI_UHS2_SW_RESET_SD ); +sdhci_writel (host, host->ier,SDHCI_INT_ENABLE ); +sdhci_writel (host, host->ier,SDHCI_SIGNAL_ENABLE ); +sdhci_uhs2_clear_set_irqs (host, +SDHCI_INT_ALL_MASK , +SDHCI_UHS2_INT_ERROR_MASK ); + } +} + +static void sdhci_gl9755_reset (struct sdhci_host *host,u8 mask) +{ +/* need internal clock */ +if (mask &SDHCI_RESET_ALL ) +sdhci_gli_enable_internal_clock (host); + +sdhci_writeb (host, mask,SDHCI_SOFTWARE_RESET ); + +/* reset sd-tran on UHS2 mode if need to reset cmd/data */ +if ((mask &SDHCI_RESET_CMD ) | (mask &SDHCI_RESET_DATA )) +sdhci_gli_uhs2_reset_sd_tran (host); + +if (mask &SDHCI_RESET_ALL ) + host->clock =0 ; + +if (sdhci_gli_wait_software_reset_done (host, mask)) +return ; +} +static inline void gl9767_vhs_read (struct pci_dev *pdev) {u32 vhs_enable;
@@ -1086,6 +1312,7 @@ static int gli_probe_slot_gl9755(struct sdhci_pci_slot *slot)gli_pcie_enable_msi (slot); slot->host->mmc->caps2 |=MMC_CAP2_NO_SDIO ;sdhci_enable_v4_mode (host); +gl9755_vendor_init (host);return 0 ; }
@@ -1524,17 +1751,24 @@ static const struct sdhci_ops sdhci_gl9755_ops = { .read_w = sdhci_gli_readw, .read_b = sdhci_gli_readb, .set_clock = sdhci_gl9755_set_clock, + .set_power = gl9755_set_power, .enable_dma = sdhci_pci_enable_dma, .set_bus_width = sdhci_set_bus_width, - .reset = sdhci_reset, + .reset = sdhci_gl9755_reset, .set_uhs_signaling = sdhci_set_uhs_signaling, .voltage_switch = sdhci_gli_voltage_switch, + .dump_uhs2_regs = sdhci_uhs2_dump_regs, + .set_timeout = sdhci_uhs2_set_timeout, + .irq = sdhci_uhs2_irq, + .uhs2_pre_detect_init = sdhci_gli_pre_detect_init, };const struct sdhci_pci_fixes sdhci_gl9755 = { .quirks =SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC , .quirks2 =SDHCI_QUIRK2_BROKEN_DDR50 , .probe_slot = gli_probe_slot_gl9755, + .add_host = sdhci_pci_uhs2_add_host, + .remove_host = sdhci_pci_uhs2_remove_host, .ops = &sdhci_gl9755_ops, #ifdef CONFIG_PM_SLEEP .resume = sdhci_pci_gli_resume,
Signature · 1 line
2.25.1
Adrian Hunter
maintainerRe: [PATCH V20 21/22] mmc: sdhci-pci-gli: enable UHS-II mode for GL9755
Quoted 291 lines · Victor Shih
From: Victor Shih <[email protected]>
Changes are:
* Disable GL9755 overcurrent interrupt when power on/off on UHS-II.
* Enable the internal clock when do reset on UHS-II mode.
* Increase timeout value before detecting UHS-II interface.
* Add vendor settings fro UHS-II mode.
* Removesdhci_gli_enable_internal_clockfuncton unusedclk_ctrlvariable.
* Make a functionsdhci_gli_wait_software_reset_done()for gl9755 reset.Signed-off-by Ben Chuang <[email protected]>Signed-off-by AKASHI Takahiro <[email protected]>Signed-off-by Victor Shih <[email protected]>Signed-off-by Lucas Lai <[email protected]>---
Updates in V20:
- Removesdhci_gli_enable_internal_clockfuncton unusedclk_ctrlvariable.
- Make a functionsdhci_gli_wait_software_reset_done()for gl9755 reset.Updates in V19:
- Addsdhci_gli_enable_internal_clock()to simplify the code in thesdhci_gl9755_reset().Updates in V17:
- Rnamegl9755_overcurrent_event_enable()to
sdhci_gli_overcurrent_event_enable().Updates in V15:
- Adjustgl9755_vendor_init()to the correct function.Updates in V13:
- Uesuhs2_sd_tranto steadMMC_UHS2_SD_TRAN.Updates in V9:
- Renamegl9755_pre_detect_init()tosdhci_gli_pre_detect_init().
- Renamegl9755_uhs2_reset_sd_tran()tosdhci_gli_uhs2_reset_sd_tran().Updates in V8:
- Usesdhci_get_vdd_value()to simplify code ingl9755_set_power().
- Useread_poll_timeout_atomic()to simplify code insdhci_wait_clock_stable().
- Useread_poll_timeout_atomic()to simplify code insdhci_gl9755_reset().Updates in V7:
- Drop usinggl9755_post_attach_sd().---
drivers/mmc/host/sdhci-pci-gli.c | 236 ++++++++++++++++++++++++++++++- 1 file changed, 235 insertions(+), 1 deletion(-)drivers/mmc/host/sdhci-pci-gli.c +214
-0@@ -18,6 +18,7 @@#include "sdhci-cqhci.h" #include "sdhci-pci.h" #include "cqhci.h" +#include "sdhci-uhs2.h" /* Genesys Logic extra registers */ #define SDHCI_GLI_9750_WT 0x800@@ -139,9 +140,36 @@#define PCI_GLI_9755_PLLSSC 0x68#define PCI_GLI_9755_PLLSSC_PPM GENMASK(15, 0) +#define PCI_GLI_9755_PLLSSC_RTL BIT(24) +#define GLI_9755_PLLSSC_RTL_VALUE 0x1 +#define PCI_GLI_9755_PLLSSC_TRANS_PASS BIT(27) +#define GLI_9755_PLLSSC_TRANS_PASS_VALUE 0x1 +#define PCI_GLI_9755_PLLSSC_RECV GENMASK(29, 28) +#define GLI_9755_PLLSSC_RECV_VALUE 0x0 +#define PCI_GLI_9755_PLLSSC_TRAN GENMASK(31, 30) +#define GLI_9755_PLLSSC_TRAN_VALUE 0x3 + +#define PCI_GLI_9755_UHS2_PLL 0x6C +#define PCI_GLI_9755_UHS2_PLL_SSC GENMASK(9, 8) +#define GLI_9755_UHS2_PLL_SSC_VALUE 0x0 +#define PCI_GLI_9755_UHS2_PLL_DELAY BIT(18) +#define GLI_9755_UHS2_PLL_DELAY_VALUE 0x1 +#define PCI_GLI_9755_UHS2_PLL_PDRST BIT(27) +#define GLI_9755_UHS2_PLL_PDRST_VALUE 0x1#define PCI_GLI_9755_SerDes 0x70 +#define PCI_GLI_9755_UHS2_SERDES_INTR GENMASK(2, 0) +#define GLI_9755_UHS2_SERDES_INTR_VALUE 0x3 +#define PCI_GLI_9755_UHS2_SERDES_ZC1 BIT(3) +#define GLI_9755_UHS2_SERDES_ZC1_VALUE 0x0 +#define PCI_GLI_9755_UHS2_SERDES_ZC2 GENMASK(7, 4) +#define GLI_9755_UHS2_SERDES_ZC2_DEFAULT 0xB +#define GLI_9755_UHS2_SERDES_ZC2_SANDISK 0x0#define PCI_GLI_9755_SCP_DIS BIT(19) +#define PCI_GLI_9755_UHS2_SERDES_TRAN GENMASK(27, 24) +#define GLI_9755_UHS2_SERDES_TRAN_VALUE 0xC +#define PCI_GLI_9755_UHS2_SERDES_RECV GENMASK(31, 28) +#define GLI_9755_UHS2_SERDES_RECV_VALUE 0xF#define PCI_GLI_9755_MISC 0x78#define PCI_GLI_9755_MISC_SSC_OFF BIT(26)@@ -779,6 +807,204 @@ static void gl9755_hw_setting(struct sdhci_pci_slot *slot)gl9755_wt_off (pdev); } +static void gl9755_vendor_init (struct sdhci_host *host) +{ +struct sdhci_pci_slot *slot =sdhci_priv (host); +struct pci_dev *pdev = slot->chip->pdev; +u32 serdes; +u32 pllssc; +u32 uhs2_pll; + +gl9755_wt_on (pdev); + +pci_read_config_dword (pdev, PCI_GLI_9755_SerDes, &serdes); + serdes &= ~PCI_GLI_9755_UHS2_SERDES_TRAN ; + serdes |=FIELD_PREP (PCI_GLI_9755_UHS2_SERDES_TRAN , +GLI_9755_UHS2_SERDES_TRAN_VALUE ); + serdes &= ~PCI_GLI_9755_UHS2_SERDES_RECV ; + serdes |=FIELD_PREP (PCI_GLI_9755_UHS2_SERDES_RECV , +GLI_9755_UHS2_SERDES_RECV_VALUE ); + serdes &= ~PCI_GLI_9755_UHS2_SERDES_INTR ; + serdes |=FIELD_PREP (PCI_GLI_9755_UHS2_SERDES_INTR , +GLI_9755_UHS2_SERDES_INTR_VALUE ); + serdes &= ~PCI_GLI_9755_UHS2_SERDES_ZC1 ; + serdes |=FIELD_PREP (PCI_GLI_9755_UHS2_SERDES_ZC1 , +GLI_9755_UHS2_SERDES_ZC1_VALUE ); + serdes &= ~PCI_GLI_9755_UHS2_SERDES_ZC2 ; + serdes |=FIELD_PREP (PCI_GLI_9755_UHS2_SERDES_ZC2 , +GLI_9755_UHS2_SERDES_ZC2_DEFAULT ); +pci_write_config_dword (pdev, PCI_GLI_9755_SerDes, serdes); + +pci_read_config_dword (pdev,PCI_GLI_9755_UHS2_PLL , &uhs2_pll); + uhs2_pll &= ~PCI_GLI_9755_UHS2_PLL_SSC ; + uhs2_pll |=FIELD_PREP (PCI_GLI_9755_UHS2_PLL_SSC , +GLI_9755_UHS2_PLL_SSC_VALUE ); + uhs2_pll &= ~PCI_GLI_9755_UHS2_PLL_DELAY ; + uhs2_pll |=FIELD_PREP (PCI_GLI_9755_UHS2_PLL_DELAY , +GLI_9755_UHS2_PLL_DELAY_VALUE ); + uhs2_pll &= ~PCI_GLI_9755_UHS2_PLL_PDRST ; + uhs2_pll |=FIELD_PREP (PCI_GLI_9755_UHS2_PLL_PDRST , +GLI_9755_UHS2_PLL_PDRST_VALUE ); +pci_write_config_dword (pdev,PCI_GLI_9755_UHS2_PLL , uhs2_pll); + +pci_read_config_dword (pdev,PCI_GLI_9755_PLLSSC , &pllssc); + pllssc &= ~PCI_GLI_9755_PLLSSC_RTL ; + pllssc |=FIELD_PREP (PCI_GLI_9755_PLLSSC_RTL , +GLI_9755_PLLSSC_RTL_VALUE ); + pllssc &= ~PCI_GLI_9755_PLLSSC_TRANS_PASS ; + pllssc |=FIELD_PREP (PCI_GLI_9755_PLLSSC_TRANS_PASS , +GLI_9755_PLLSSC_TRANS_PASS_VALUE ); + pllssc &= ~PCI_GLI_9755_PLLSSC_RECV ; + pllssc |=FIELD_PREP (PCI_GLI_9755_PLLSSC_RECV , +GLI_9755_PLLSSC_RECV_VALUE ); + pllssc &= ~PCI_GLI_9755_PLLSSC_TRAN ; + pllssc |=FIELD_PREP (PCI_GLI_9755_PLLSSC_TRAN , +GLI_9755_PLLSSC_TRAN_VALUE ); +pci_write_config_dword (pdev,PCI_GLI_9755_PLLSSC , pllssc); + +gl9755_wt_off (pdev); +} + +static void sdhci_gli_pre_detect_init (struct sdhci_host *host) +{ +/* Need more time on UHS2 detect flow */ +sdhci_writeb (host,0xA7 ,SDHCI_UHS2_TIMER_CTRL ); +} + +static void sdhci_gli_overcurrent_event_enable (struct sdhci_host *host,bool enable) +{ +u32 mask; + + mask =sdhci_readl (host,SDHCI_SIGNAL_ENABLE ); +if (enable) + mask |=SDHCI_INT_BUS_POWER ; +else + mask &= ~SDHCI_INT_BUS_POWER ; + +sdhci_writel (host, mask,SDHCI_SIGNAL_ENABLE ); + + mask =sdhci_readl (host,SDHCI_INT_ENABLE ); +if (enable) + mask |=SDHCI_INT_BUS_POWER ; +else + mask &= ~SDHCI_INT_BUS_POWER ; + +sdhci_writel (host, mask,SDHCI_INT_ENABLE ); +} + +static void gl9755_set_power (struct sdhci_host *host,unsigned char mode, +unsigned short vdd) +{ +u8 pwr =0 ; + +if (mode !=MMC_POWER_OFF ) { + pwr =sdhci_get_vdd_value (vdd); +if (!pwr) +WARN (1 ,"%s: Invalid vdd %#x\n" ,mmc_hostname (host->mmc), vdd); + pwr |=SDHCI_VDD2_POWER_180 ; + } + +if (host->pwr == pwr) +return ; + + host->pwr = pwr; + +if (pwr ==0 ) { +sdhci_gli_overcurrent_event_enable (host, false); +sdhci_writeb (host,0 ,SDHCI_POWER_CONTROL ); + }else { +sdhci_gli_overcurrent_event_enable (host, false); +sdhci_writeb (host,0 ,SDHCI_POWER_CONTROL ); + + pwr |= (SDHCI_POWER_ON |SDHCI_VDD2_POWER_ON ); + +sdhci_writeb (host, pwr &0xf ,SDHCI_POWER_CONTROL ); +/* wait stable */ +mdelay (5 ); +sdhci_writeb (host, pwr,SDHCI_POWER_CONTROL ); +/* wait stable */ +mdelay (5 ); +sdhci_gli_overcurrent_event_enable (host, true); + } +} + +static bool sdhci_wait_clock_stable (struct sdhci_host *host) +{ +u16 clk =0 ; + +if (read_poll_timeout_atomic (sdhci_readw, clk, (clk &SDHCI_CLOCK_INT_STABLE ), +10 ,20000 , false, host,SDHCI_CLOCK_CONTROL )) { +pr_err ("%s: Internal clock never stabilised.\n" ,mmc_hostname (host->mmc)); +sdhci_dumpregs (host); +return false; + } +return true; +} + +static void sdhci_gli_enable_internal_clock (struct sdhci_host *host) +{ +u16 ctrl2; + + ctrl2 =sdhci_readw (host,SDHCI_HOST_CONTROL2 ); + +sdhci_writew (host,SDHCI_CLOCK_INT_EN ,SDHCI_CLOCK_CONTROL ); + +if (!((ctrl2 &SDHCI_CTRL_V4_MODE ) && + (ctrl2 &SDHCI_CTRL_UHS2_ENABLE ))) { +sdhci_wait_clock_stable (host); +sdhci_writew (host,SDHCI_CTRL_V4_MODE ,SDHCI_HOST_CONTROL2 ); + } +} + +static int sdhci_gli_wait_software_reset_done (struct sdhci_host *host,u8 mask) +{ +u8 rst; + +/* hw clears the bit when it's done */ +if (read_poll_timeout_atomic (sdhci_readb, rst, !(rst & mask), +10 ,100000 , false, host,SDHCI_SOFTWARE_RESET )) { +pr_err ("%s: Reset 0x%x never completed.\n" ,mmc_hostname (host->mmc), (int )mask); +sdhci_dumpregs (host); +/* manual clear */ +sdhci_writeb (host,0 ,SDHCI_SOFTWARE_RESET ); +return -ETIMEDOUT ; + } + +return 0 ; +} + +static void sdhci_gli_uhs2_reset_sd_tran (struct sdhci_host *host) +{ +/* do this on UHS2 mode */ +if (host->mmc->uhs2_sd_tran) { +sdhci_uhs2_reset (host,SDHCI_UHS2_SW_RESET_SD ); +sdhci_writel (host, host->ier,SDHCI_INT_ENABLE ); +sdhci_writel (host, host->ier,SDHCI_SIGNAL_ENABLE ); +sdhci_uhs2_clear_set_irqs (host, +SDHCI_INT_ALL_MASK , +SDHCI_UHS2_INT_ERROR_MASK ); + } +} + +static void sdhci_gl9755_reset (struct sdhci_host *host,u8 mask) +{ +/* need internal clock */ +if (mask &SDHCI_RESET_ALL ) +sdhci_gli_enable_internal_clock (host); + +sdhci_writeb (host, mask,SDHCI_SOFTWARE_RESET );
drivers/mmc/host/sdhci-pci-gli.c static void gl9755_hw_setting(struct sdhci_pci_slot *slot) · line 1005
Quoted 10 lines
drivers/mmc/host/sdhci-pci-gli.c +10
-0+ +/* reset sd-tran on UHS2 mode if need to reset cmd/data */ +if ((mask &SDHCI_RESET_CMD ) | (mask &SDHCI_RESET_DATA )) +sdhci_gli_uhs2_reset_sd_tran (host); + +if (mask &SDHCI_RESET_ALL ) + host->clock =0 ; + +if (sdhci_gli_wait_software_reset_done (host, mask)) +return ;
Should be just:
sdhci_gli_wait_software_reset_done(host, mask);
Quoted 39 lines
drivers/mmc/host/sdhci-pci-gli.c +11
-1+} +static inline void gl9767_vhs_read (struct pci_dev *pdev) {u32 vhs_enable;@@ -1086,6 +1312,7 @@ static int gli_probe_slot_gl9755(struct sdhci_pci_slot *slot)gli_pcie_enable_msi (slot); slot->host->mmc->caps2 |=MMC_CAP2_NO_SDIO ;sdhci_enable_v4_mode (host); +gl9755_vendor_init (host);return 0 ; }@@ -1524,17 +1751,24 @@ static const struct sdhci_ops sdhci_gl9755_ops = { .read_w = sdhci_gli_readw, .read_b = sdhci_gli_readb, .set_clock = sdhci_gl9755_set_clock, + .set_power = gl9755_set_power, .enable_dma = sdhci_pci_enable_dma, .set_bus_width = sdhci_set_bus_width, - .reset = sdhci_reset, + .reset = sdhci_gl9755_reset, .set_uhs_signaling = sdhci_set_uhs_signaling, .voltage_switch = sdhci_gli_voltage_switch, + .dump_uhs2_regs = sdhci_uhs2_dump_regs, + .set_timeout = sdhci_uhs2_set_timeout, + .irq = sdhci_uhs2_irq, + .uhs2_pre_detect_init = sdhci_gli_pre_detect_init, };const struct sdhci_pci_fixes sdhci_gl9755 = { .quirks =SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC , .quirks2 =SDHCI_QUIRK2_BROKEN_DDR50 , .probe_slot = gli_probe_slot_gl9755, + .add_host = sdhci_pci_uhs2_add_host, + .remove_host = sdhci_pci_uhs2_remove_host, .ops = &sdhci_gl9755_ops, #ifdef CONFIG_PM_SLEEP .resume = sdhci_pci_gli_resume,
Re: [PATCH V20 21/22] mmc: sdhci-pci-gli: enable UHS-II mode for GL9755
Quoted 306 lines · Adrian Hunter
Quoted 291 lines · Victor Shih
From: Victor Shih <[email protected]>
Changes are:
* Disable GL9755 overcurrent interrupt when power on/off on UHS-II.
* Enable the internal clock when do reset on UHS-II mode.
* Increase timeout value before detecting UHS-II interface.
* Add vendor settings fro UHS-II mode.
* Removesdhci_gli_enable_internal_clockfuncton unusedclk_ctrlvariable.
* Make a functionsdhci_gli_wait_software_reset_done()for gl9755 reset.Signed-off-by Ben Chuang <[email protected]>Signed-off-by AKASHI Takahiro <[email protected]>Signed-off-by Victor Shih <[email protected]>Signed-off-by Lucas Lai <[email protected]>---
Updates in V20:
- Removesdhci_gli_enable_internal_clockfuncton unusedclk_ctrlvariable.
- Make a functionsdhci_gli_wait_software_reset_done()for gl9755 reset.Updates in V19:
- Addsdhci_gli_enable_internal_clock()to simplify the code in thesdhci_gl9755_reset().Updates in V17:
- Rnamegl9755_overcurrent_event_enable()to
sdhci_gli_overcurrent_event_enable().Updates in V15:
- Adjustgl9755_vendor_init()to the correct function.Updates in V13:
- Uesuhs2_sd_tranto steadMMC_UHS2_SD_TRAN.Updates in V9:
- Renamegl9755_pre_detect_init()tosdhci_gli_pre_detect_init().
- Renamegl9755_uhs2_reset_sd_tran()tosdhci_gli_uhs2_reset_sd_tran().Updates in V8:
- Usesdhci_get_vdd_value()to simplify code ingl9755_set_power().
- Useread_poll_timeout_atomic()to simplify code insdhci_wait_clock_stable().
- Useread_poll_timeout_atomic()to simplify code insdhci_gl9755_reset().Updates in V7:
- Drop usinggl9755_post_attach_sd().---
drivers/mmc/host/sdhci-pci-gli.c | 236 ++++++++++++++++++++++++++++++- 1 file changed, 235 insertions(+), 1 deletion(-)drivers/mmc/host/sdhci-pci-gli.c +214
-0@@ -18,6 +18,7 @@#include "sdhci-cqhci.h" #include "sdhci-pci.h" #include "cqhci.h" +#include "sdhci-uhs2.h" /* Genesys Logic extra registers */ #define SDHCI_GLI_9750_WT 0x800@@ -139,9 +140,36 @@#define PCI_GLI_9755_PLLSSC 0x68#define PCI_GLI_9755_PLLSSC_PPM GENMASK(15, 0) +#define PCI_GLI_9755_PLLSSC_RTL BIT(24) +#define GLI_9755_PLLSSC_RTL_VALUE 0x1 +#define PCI_GLI_9755_PLLSSC_TRANS_PASS BIT(27) +#define GLI_9755_PLLSSC_TRANS_PASS_VALUE 0x1 +#define PCI_GLI_9755_PLLSSC_RECV GENMASK(29, 28) +#define GLI_9755_PLLSSC_RECV_VALUE 0x0 +#define PCI_GLI_9755_PLLSSC_TRAN GENMASK(31, 30) +#define GLI_9755_PLLSSC_TRAN_VALUE 0x3 + +#define PCI_GLI_9755_UHS2_PLL 0x6C +#define PCI_GLI_9755_UHS2_PLL_SSC GENMASK(9, 8) +#define GLI_9755_UHS2_PLL_SSC_VALUE 0x0 +#define PCI_GLI_9755_UHS2_PLL_DELAY BIT(18) +#define GLI_9755_UHS2_PLL_DELAY_VALUE 0x1 +#define PCI_GLI_9755_UHS2_PLL_PDRST BIT(27) +#define GLI_9755_UHS2_PLL_PDRST_VALUE 0x1#define PCI_GLI_9755_SerDes 0x70 +#define PCI_GLI_9755_UHS2_SERDES_INTR GENMASK(2, 0) +#define GLI_9755_UHS2_SERDES_INTR_VALUE 0x3 +#define PCI_GLI_9755_UHS2_SERDES_ZC1 BIT(3) +#define GLI_9755_UHS2_SERDES_ZC1_VALUE 0x0 +#define PCI_GLI_9755_UHS2_SERDES_ZC2 GENMASK(7, 4) +#define GLI_9755_UHS2_SERDES_ZC2_DEFAULT 0xB +#define GLI_9755_UHS2_SERDES_ZC2_SANDISK 0x0#define PCI_GLI_9755_SCP_DIS BIT(19) +#define PCI_GLI_9755_UHS2_SERDES_TRAN GENMASK(27, 24) +#define GLI_9755_UHS2_SERDES_TRAN_VALUE 0xC +#define PCI_GLI_9755_UHS2_SERDES_RECV GENMASK(31, 28) +#define GLI_9755_UHS2_SERDES_RECV_VALUE 0xF#define PCI_GLI_9755_MISC 0x78#define PCI_GLI_9755_MISC_SSC_OFF BIT(26)@@ -779,6 +807,204 @@ static void gl9755_hw_setting(struct sdhci_pci_slot *slot)gl9755_wt_off (pdev); } +static void gl9755_vendor_init (struct sdhci_host *host) +{ +struct sdhci_pci_slot *slot =sdhci_priv (host); +struct pci_dev *pdev = slot->chip->pdev; +u32 serdes; +u32 pllssc; +u32 uhs2_pll; + +gl9755_wt_on (pdev); + +pci_read_config_dword (pdev, PCI_GLI_9755_SerDes, &serdes); + serdes &= ~PCI_GLI_9755_UHS2_SERDES_TRAN ; + serdes |=FIELD_PREP (PCI_GLI_9755_UHS2_SERDES_TRAN , +GLI_9755_UHS2_SERDES_TRAN_VALUE ); + serdes &= ~PCI_GLI_9755_UHS2_SERDES_RECV ; + serdes |=FIELD_PREP (PCI_GLI_9755_UHS2_SERDES_RECV , +GLI_9755_UHS2_SERDES_RECV_VALUE ); + serdes &= ~PCI_GLI_9755_UHS2_SERDES_INTR ; + serdes |=FIELD_PREP (PCI_GLI_9755_UHS2_SERDES_INTR , +GLI_9755_UHS2_SERDES_INTR_VALUE ); + serdes &= ~PCI_GLI_9755_UHS2_SERDES_ZC1 ; + serdes |=FIELD_PREP (PCI_GLI_9755_UHS2_SERDES_ZC1 , +GLI_9755_UHS2_SERDES_ZC1_VALUE ); + serdes &= ~PCI_GLI_9755_UHS2_SERDES_ZC2 ; + serdes |=FIELD_PREP (PCI_GLI_9755_UHS2_SERDES_ZC2 , +GLI_9755_UHS2_SERDES_ZC2_DEFAULT ); +pci_write_config_dword (pdev, PCI_GLI_9755_SerDes, serdes); + +pci_read_config_dword (pdev,PCI_GLI_9755_UHS2_PLL , &uhs2_pll); + uhs2_pll &= ~PCI_GLI_9755_UHS2_PLL_SSC ; + uhs2_pll |=FIELD_PREP (PCI_GLI_9755_UHS2_PLL_SSC , +GLI_9755_UHS2_PLL_SSC_VALUE ); + uhs2_pll &= ~PCI_GLI_9755_UHS2_PLL_DELAY ; + uhs2_pll |=FIELD_PREP (PCI_GLI_9755_UHS2_PLL_DELAY , +GLI_9755_UHS2_PLL_DELAY_VALUE ); + uhs2_pll &= ~PCI_GLI_9755_UHS2_PLL_PDRST ; + uhs2_pll |=FIELD_PREP (PCI_GLI_9755_UHS2_PLL_PDRST , +GLI_9755_UHS2_PLL_PDRST_VALUE ); +pci_write_config_dword (pdev,PCI_GLI_9755_UHS2_PLL , uhs2_pll); + +pci_read_config_dword (pdev,PCI_GLI_9755_PLLSSC , &pllssc); + pllssc &= ~PCI_GLI_9755_PLLSSC_RTL ; + pllssc |=FIELD_PREP (PCI_GLI_9755_PLLSSC_RTL , +GLI_9755_PLLSSC_RTL_VALUE ); + pllssc &= ~PCI_GLI_9755_PLLSSC_TRANS_PASS ; + pllssc |=FIELD_PREP (PCI_GLI_9755_PLLSSC_TRANS_PASS , +GLI_9755_PLLSSC_TRANS_PASS_VALUE ); + pllssc &= ~PCI_GLI_9755_PLLSSC_RECV ; + pllssc |=FIELD_PREP (PCI_GLI_9755_PLLSSC_RECV , +GLI_9755_PLLSSC_RECV_VALUE ); + pllssc &= ~PCI_GLI_9755_PLLSSC_TRAN ; + pllssc |=FIELD_PREP (PCI_GLI_9755_PLLSSC_TRAN , +GLI_9755_PLLSSC_TRAN_VALUE ); +pci_write_config_dword (pdev,PCI_GLI_9755_PLLSSC , pllssc); + +gl9755_wt_off (pdev); +} + +static void sdhci_gli_pre_detect_init (struct sdhci_host *host) +{ +/* Need more time on UHS2 detect flow */ +sdhci_writeb (host,0xA7 ,SDHCI_UHS2_TIMER_CTRL ); +} + +static void sdhci_gli_overcurrent_event_enable (struct sdhci_host *host,bool enable) +{ +u32 mask; + + mask =sdhci_readl (host,SDHCI_SIGNAL_ENABLE ); +if (enable) + mask |=SDHCI_INT_BUS_POWER ; +else + mask &= ~SDHCI_INT_BUS_POWER ; + +sdhci_writel (host, mask,SDHCI_SIGNAL_ENABLE ); + + mask =sdhci_readl (host,SDHCI_INT_ENABLE ); +if (enable) + mask |=SDHCI_INT_BUS_POWER ; +else + mask &= ~SDHCI_INT_BUS_POWER ; + +sdhci_writel (host, mask,SDHCI_INT_ENABLE ); +} + +static void gl9755_set_power (struct sdhci_host *host,unsigned char mode, +unsigned short vdd) +{ +u8 pwr =0 ; + +if (mode !=MMC_POWER_OFF ) { + pwr =sdhci_get_vdd_value (vdd); +if (!pwr) +WARN (1 ,"%s: Invalid vdd %#x\n" ,mmc_hostname (host->mmc), vdd); + pwr |=SDHCI_VDD2_POWER_180 ; + } + +if (host->pwr == pwr) +return ; + + host->pwr = pwr; + +if (pwr ==0 ) { +sdhci_gli_overcurrent_event_enable (host, false); +sdhci_writeb (host,0 ,SDHCI_POWER_CONTROL ); + }else { +sdhci_gli_overcurrent_event_enable (host, false); +sdhci_writeb (host,0 ,SDHCI_POWER_CONTROL ); + + pwr |= (SDHCI_POWER_ON |SDHCI_VDD2_POWER_ON ); + +sdhci_writeb (host, pwr &0xf ,SDHCI_POWER_CONTROL ); +/* wait stable */ +mdelay (5 ); +sdhci_writeb (host, pwr,SDHCI_POWER_CONTROL ); +/* wait stable */ +mdelay (5 ); +sdhci_gli_overcurrent_event_enable (host, true); + } +} + +static bool sdhci_wait_clock_stable (struct sdhci_host *host) +{ +u16 clk =0 ; + +if (read_poll_timeout_atomic (sdhci_readw, clk, (clk &SDHCI_CLOCK_INT_STABLE ), +10 ,20000 , false, host,SDHCI_CLOCK_CONTROL )) { +pr_err ("%s: Internal clock never stabilised.\n" ,mmc_hostname (host->mmc)); +sdhci_dumpregs (host); +return false; + } +return true; +} + +static void sdhci_gli_enable_internal_clock (struct sdhci_host *host) +{ +u16 ctrl2; + + ctrl2 =sdhci_readw (host,SDHCI_HOST_CONTROL2 ); + +sdhci_writew (host,SDHCI_CLOCK_INT_EN ,SDHCI_CLOCK_CONTROL ); + +if (!((ctrl2 &SDHCI_CTRL_V4_MODE ) && + (ctrl2 &SDHCI_CTRL_UHS2_ENABLE ))) { +sdhci_wait_clock_stable (host); +sdhci_writew (host,SDHCI_CTRL_V4_MODE ,SDHCI_HOST_CONTROL2 ); + } +} + +static int sdhci_gli_wait_software_reset_done (struct sdhci_host *host,u8 mask) +{ +u8 rst; + +/* hw clears the bit when it's done */ +if (read_poll_timeout_atomic (sdhci_readb, rst, !(rst & mask), +10 ,100000 , false, host,SDHCI_SOFTWARE_RESET )) { +pr_err ("%s: Reset 0x%x never completed.\n" ,mmc_hostname (host->mmc), (int )mask); +sdhci_dumpregs (host); +/* manual clear */ +sdhci_writeb (host,0 ,SDHCI_SOFTWARE_RESET ); +return -ETIMEDOUT ; + } + +return 0 ; +} + +static void sdhci_gli_uhs2_reset_sd_tran (struct sdhci_host *host) +{ +/* do this on UHS2 mode */ +if (host->mmc->uhs2_sd_tran) { +sdhci_uhs2_reset (host,SDHCI_UHS2_SW_RESET_SD ); +sdhci_writel (host, host->ier,SDHCI_INT_ENABLE ); +sdhci_writel (host, host->ier,SDHCI_SIGNAL_ENABLE ); +sdhci_uhs2_clear_set_irqs (host, +SDHCI_INT_ALL_MASK , +SDHCI_UHS2_INT_ERROR_MASK ); + } +} + +static void sdhci_gl9755_reset (struct sdhci_host *host,u8 mask) +{ +/* need internal clock */ +if (mask &SDHCI_RESET_ALL ) +sdhci_gli_enable_internal_clock (host); + +sdhci_writeb (host, mask,SDHCI_SOFTWARE_RESET );drivers/mmc/host/sdhci-pci-gli.c static void gl9755_hw_setting(struct sdhci_pci_slot *slot) · line 1005
Quoted 10 lines
drivers/mmc/host/sdhci-pci-gli.c +10
-0+ +/* reset sd-tran on UHS2 mode if need to reset cmd/data */ +if ((mask &SDHCI_RESET_CMD ) | (mask &SDHCI_RESET_DATA )) +sdhci_gli_uhs2_reset_sd_tran (host); + +if (mask &SDHCI_RESET_ALL ) + host->clock =0 ; + +if (sdhci_gli_wait_software_reset_done (host, mask)) +return ;Should be just:
Quoted 2 lines
sdhci_gli_wait_software_reset_done(host, mask);
Hi, Adrian
I will update this in the next version.
Thanks, Victor Shih
Quoted 40 lines
Quoted 39 lines
drivers/mmc/host/sdhci-pci-gli.c +11
-1+} +static inline void gl9767_vhs_read (struct pci_dev *pdev) {u32 vhs_enable;@@ -1086,6 +1312,7 @@ static int gli_probe_slot_gl9755(struct sdhci_pci_slot *slot)gli_pcie_enable_msi (slot); slot->host->mmc->caps2 |=MMC_CAP2_NO_SDIO ;sdhci_enable_v4_mode (host); +gl9755_vendor_init (host);return 0 ; }@@ -1524,17 +1751,24 @@ static const struct sdhci_ops sdhci_gl9755_ops = { .read_w = sdhci_gli_readw, .read_b = sdhci_gli_readb, .set_clock = sdhci_gl9755_set_clock, + .set_power = gl9755_set_power, .enable_dma = sdhci_pci_enable_dma, .set_bus_width = sdhci_set_bus_width, - .reset = sdhci_reset, + .reset = sdhci_gl9755_reset, .set_uhs_signaling = sdhci_set_uhs_signaling, .voltage_switch = sdhci_gli_voltage_switch, + .dump_uhs2_regs = sdhci_uhs2_dump_regs, + .set_timeout = sdhci_uhs2_set_timeout, + .irq = sdhci_uhs2_irq, + .uhs2_pre_detect_init = sdhci_gli_pre_detect_init, };const struct sdhci_pci_fixes sdhci_gl9755 = { .quirks =SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC , .quirks2 =SDHCI_QUIRK2_BROKEN_DDR50 , .probe_slot = gli_probe_slot_gl9755, + .add_host = sdhci_pci_uhs2_add_host, + .remove_host = sdhci_pci_uhs2_remove_host, .ops = &sdhci_gl9755_ops, #ifdef CONFIG_PM_SLEEP .resume = sdhci_pci_gli_resume,
PATCH v20 22/22 mmc: sdhci-pci-gli: enable UHS-II mode for GL9767
In reply to Victor ShihFrom: Victor Shih <[email protected]>
Changes are:
* Enable the internal clock when do reset on UHS-II mode.
* Increase timeout value before detecting UHS-II interface.
* Add vendor settings for UHS-II mode.
* Use the function sdhci_gli_wait_software_reset_done() for gl9767 reset.
---
Updates in V20:
- Use the function sdhci_gli_wait_software_reset_done() for gl9767 reset.
Updates in V19:
- Use sdhci_gli_enable_internal_clock() to simplify the code in the sdhci_gl9767_reset().
- Directly reading the SDHCI_PRESENT_STATE register to replace the get_cd() avoids the possibility of the get_cd() sleeping in the sdhci_gl9767_set_card_detect_debounce_time().
- Refine the position of gli_set_9767() in the sdhci_gl9767_reset().
Updates in V18:
- Add new register settings for gl9767.
- Add card_event in the sdhci_ops for gl9767.
- Add sdhci_gl9767_set_card_detect_debounce_time() to configure the gl9767.
- Adjust the sdhci_gl9767_reset() process for gl9767.
Updates in V17:
- Use mmc_card_uhs2() to simplify the code in the sdhci_gl9767_reset().
- Use mmc_card_uhs2() to simplify the code in the sdhci_gl9767_set_power().
- Add sdhci_gli_overcurrent_event_enable() to sdhci_gl9767_set_power().
Updates in V15:
- Add gl9767 to support uhs2 function.
---
drivers/mmc/host/sdhci-pci-gli.c | 203 ++++++++++++++++++++++++++++++- 1 file changed, 202 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-pci-gli.c +202 -1
@@ -174,6 +174,15 @@#define PCI_GLI_9755_MISC 0x78#define PCI_GLI_9755_MISC_SSC_OFF BIT(26) +#define SDHCI_GLI_9767_SD_HOST_OPERATION_CTL 0x508 +#define SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_CMD_CONFLICT_CHECK BIT(0) +#define SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE GENMASK(21, 16) +#define SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_PLUG_IN_VALUE 0x05 +#define SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_PLUG_OUT_VALUE 0x3F +#define SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_SCALE GENMASK(23, 22) +#define SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_SCALE_1MS 0x2 +#define SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_SCALE_10MS 0x3 +#define SDHCI_GLI_9767_GM_BURST_SIZE 0x510#define SDHCI_GLI_9767_GM_BURST_SIZE_AXI_ALWAYS_SET BIT(8)
@@ -210,6 +219,13 @@#define PCIE_GLI_9767_SCR_CORE_PWR_D3_OFF BIT(21)#define PCIE_GLI_9767_SCR_CFG_RST_DATA_LINK_DOWN BIT(30) +#define PCIE_GLI_9767_RESET_REG 0x8E4 +#define PCIE_GLI_9767_RESET_REG_SD_HOST_SW_RESET BIT(0) + +#define PCIE_GLI_9767_UHS2_PHY_SET_REG1 0x90C +#define PCIE_GLI_9767_UHS2_PHY_SET_REG1_SERDES_INTR GENMASK(31, 29) +#define PCIE_GLI_9767_UHS2_PHY_SET_REG1_SERDES_INTR_VALUE 0x3 +#define PCIE_GLI_9767_SDHC_CAP 0x91C#define PCIE_GLI_9767_SDHC_CAP_SDEI_RESULT BIT(5)
@@ -228,9 +244,15 @@#define PCIE_GLI_9767_SD_EXPRESS_CTL_SD_EXPRESS_MODE BIT(1)#define PCIE_GLI_9767_SD_DATA_MULTI_CTL 0x944 +#define PCIE_GLI_9767_SD_DATA_MULTI_CTL_SELECT_UHS2 BIT(5) +#define PCIE_GLI_9767_SD_DATA_MULTI_CTL_UHS2_SWITCH_CTL BIT(8)#define PCIE_GLI_9767_SD_DATA_MULTI_CTL_DISCONNECT_TIME GENMASK(23, 16)#define PCIE_GLI_9767_SD_DATA_MULTI_CTL_DISCONNECT_TIME_VALUE 0x64 +#define PCIE_GLI_9767_UHS2_PHY_SET_REG2 0x948 +#define PCIE_GLI_9767_UHS2_PHY_SET_REG2_SSC_PPM_SETTING GENMASK(22, 21) +#define PCIE_GLI_9767_UHS2_PHY_SET_REG2_SSC_PPM_SETTING_VALUE 0x0 +#define PCIE_GLI_9767_NORMAL_ERR_INT_STATUS_REG2 0x950#define PCIE_GLI_9767_NORMAL_ERR_INT_STATUS_REG2_SDEI_COMPLETE BIT(0)
@@ -240,6 +262,28 @@#define PCIE_GLI_9767_NORMAL_ERR_INT_SIGNAL_EN_REG2 0x958#define PCIE_GLI_9767_NORMAL_ERR_INT_SIGNAL_EN_REG2_SDEI_COMPLETE_SIGNAL_EN BIT(0) +#define PCIE_GLI_9767_UHS2_CTL1 0x95C +#define PCIE_GLI_9767_UHS2_CTL1_TRANS_PASS BIT(5) +#define PCIE_GLI_9767_UHS2_CTL1_TRANS_PASS_VALUE 0x1 +#define PCIE_GLI_9767_UHS2_CTL1_DECODING_CTL BIT(6) +#define PCIE_GLI_9767_UHS2_CTL1_DECODING_CTL_VALUE 0x1 +#define PCIE_GLI_9767_UHS2_CTL1_SERDES_TRAN GENMASK(10, 7) +#define PCIE_GLI_9767_UHS2_CTL1_SERDES_TRAN_VALUE 0x3 +#define PCIE_GLI_9767_UHS2_CTL1_SERDES_RECV GENMASK(14, 11) +#define PCIE_GLI_9767_UHS2_CTL1_SERDES_RECV_VALUE 0xf +#define PCIE_GLI_9767_UHS2_CTL1_DIR_TRANS GENMASK(16, 15) +#define PCIE_GLI_9767_UHS2_CTL1_DIR_TRANS_VALUE 0x0 +#define PCIE_GLI_9767_UHS2_CTL1_DIR_RECV GENMASK(18, 17) +#define PCIE_GLI_9767_UHS2_CTL1_DIR_RECV_VALUE 0x0 +#define PCIE_GLI_9767_UHS2_CTL1_PDRST BIT(25) +#define PCIE_GLI_9767_UHS2_CTL1_PDRST_VALUE 0x1 + +#define PCIE_GLI_9767_UHS2_CTL2 0x964 +#define PCIE_GLI_9767_UHS2_CTL2_ZC GENMASK(3, 0) +#define PCIE_GLI_9767_UHS2_CTL2_ZC_VALUE 0xb +#define PCIE_GLI_9767_UHS2_CTL2_ZC_CTL BIT(6) +#define PCIE_GLI_9767_UHS2_CTL2_ZC_CTL_VALUE 0x1 +#define GLI_MAX_TUNING_LOOP 40/* Genesys Logic chipset */
@@ -1156,6 +1200,31 @@ static void sdhci_gl9767_set_clock(struct sdhci_host *host, unsigned int clock)gl9767_vhs_read (pdev); } +static void sdhci_gl9767_set_card_detect_debounce_time (struct sdhci_host *host) +{ +u32 value; + + value =sdhci_readl (host,SDHCI_GLI_9767_SD_HOST_OPERATION_CTL ); + value &= ~(SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE | +SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_SCALE ); +if (sdhci_readl (host,SDHCI_PRESENT_STATE ) &SDHCI_CARD_PRESENT ) + value |=FIELD_PREP (SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE , +SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_PLUG_IN_VALUE ) | +FIELD_PREP (SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_SCALE , +SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_SCALE_1MS ); +else + value |=FIELD_PREP (SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE , +SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_PLUG_OUT_VALUE ) | +FIELD_PREP (SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_SCALE , +SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_DEBOUNCE_SCALE_10MS ); +sdhci_writel (host, value,SDHCI_GLI_9767_SD_HOST_OPERATION_CTL ); +} + +static void sdhci_gl9767_card_event (struct sdhci_host *host) +{ +sdhci_gl9767_set_card_detect_debounce_time (host); +} +static void gli_set_9767 (struct sdhci_host *host) {u32 value;
@@ -1163,6 +1232,12 @@ static void gli_set_9767(struct sdhci_host *host) value =sdhci_readl (host,SDHCI_GLI_9767_GM_BURST_SIZE ); value &= ~SDHCI_GLI_9767_GM_BURST_SIZE_AXI_ALWAYS_SET ;sdhci_writel (host, value,SDHCI_GLI_9767_GM_BURST_SIZE ); + + value =sdhci_readl (host,SDHCI_GLI_9767_SD_HOST_OPERATION_CTL ); + value &= ~SDHCI_GLI_9767_SD_HOST_OPERATION_CTL_CMD_CONFLICT_CHECK ; +sdhci_writel (host, value,SDHCI_GLI_9767_SD_HOST_OPERATION_CTL ); + +sdhci_gl9767_set_card_detect_debounce_time (host); }static void gl9767_hw_setting (struct sdhci_pci_slot *slot)
@@ -1201,7 +1276,44 @@ static void gl9767_hw_setting(struct sdhci_pci_slot *slot)static void sdhci_gl9767_reset (struct sdhci_host *host,u8 mask) { -sdhci_reset (host, mask); +struct sdhci_pci_slot *slot =sdhci_priv (host); +struct pci_dev *pdev = slot->chip->pdev; +u32 value; + +/* need internal clock */ +if (mask &SDHCI_RESET_ALL ) { +sdhci_gli_enable_internal_clock (host); + +gl9767_vhs_write (pdev); + +pci_read_config_dword (pdev,PCIE_GLI_9767_RESET_REG , &value); + value &= ~PCIE_GLI_9767_RESET_REG_SD_HOST_SW_RESET ; +pci_write_config_dword (pdev,PCIE_GLI_9767_RESET_REG , value); + +if (read_poll_timeout_atomic (pci_read_config_dword, value, + !(value &PCIE_GLI_9767_RESET_REG_SD_HOST_SW_RESET ), +1 ,5 , true, pdev,PCIE_GLI_9767_RESET_REG , &value)) { +pr_warn ("%s: %s: Reset SDHC AHB and TL-AMBA failure.\n" , + __func__,mmc_hostname (host->mmc)); +gl9767_vhs_read (pdev); +return ; + } +gl9767_vhs_read (pdev); + } + +if (mmc_card_uhs2 (host->mmc)) { +if (mask & (SDHCI_RESET_CMD |SDHCI_RESET_DATA )) { +sdhci_writeb (host, mask,SDHCI_SOFTWARE_RESET ); +sdhci_gli_uhs2_reset_sd_tran (host); +if (sdhci_gli_wait_software_reset_done (host, mask)) +return ; + }else { +sdhci_uhs2_reset (host, mask); + } + }else { +sdhci_reset (host, mask); + } +gli_set_9767 (host); }
@@ -1292,6 +1404,86 @@ static int gl9767_init_sd_express(struct mmc_host *mmc, struct mmc_ios *ios)return 0 ; } +static void gl9767_vendor_init (struct sdhci_host *host) +{ +struct sdhci_pci_slot *slot =sdhci_priv (host); +struct pci_dev *pdev = slot->chip->pdev; +u32 value; + +gl9767_vhs_write (pdev); + +pci_read_config_dword (pdev,PCIE_GLI_9767_UHS2_PHY_SET_REG1 , &value); + value |=FIELD_PREP (PCIE_GLI_9767_UHS2_PHY_SET_REG1_SERDES_INTR , +PCIE_GLI_9767_UHS2_PHY_SET_REG1_SERDES_INTR_VALUE ); +pci_write_config_dword (pdev,PCIE_GLI_9767_UHS2_PHY_SET_REG1 , value); + +pci_read_config_dword (pdev,PCIE_GLI_9767_UHS2_PHY_SET_REG2 , &value); + value |=FIELD_PREP (PCIE_GLI_9767_UHS2_PHY_SET_REG2_SSC_PPM_SETTING , +PCIE_GLI_9767_UHS2_PHY_SET_REG2_SSC_PPM_SETTING_VALUE ); +pci_write_config_dword (pdev,PCIE_GLI_9767_UHS2_PHY_SET_REG2 , value); + +pci_read_config_dword (pdev,PCIE_GLI_9767_UHS2_CTL1 , &value); + value |=FIELD_PREP (PCIE_GLI_9767_UHS2_CTL1_TRANS_PASS , +PCIE_GLI_9767_UHS2_CTL1_TRANS_PASS_VALUE ) | +FIELD_PREP (PCIE_GLI_9767_UHS2_CTL1_DECODING_CTL , +PCIE_GLI_9767_UHS2_CTL1_DECODING_CTL_VALUE ) | +FIELD_PREP (PCIE_GLI_9767_UHS2_CTL1_SERDES_TRAN , +PCIE_GLI_9767_UHS2_CTL1_SERDES_TRAN_VALUE ) | +FIELD_PREP (PCIE_GLI_9767_UHS2_CTL1_SERDES_RECV , +PCIE_GLI_9767_UHS2_CTL1_SERDES_RECV_VALUE ) | +FIELD_PREP (PCIE_GLI_9767_UHS2_CTL1_DIR_TRANS , +PCIE_GLI_9767_UHS2_CTL1_DIR_TRANS_VALUE ) | +FIELD_PREP (PCIE_GLI_9767_UHS2_CTL1_DIR_RECV , +PCIE_GLI_9767_UHS2_CTL1_DIR_RECV_VALUE ) | +FIELD_PREP (PCIE_GLI_9767_UHS2_CTL1_PDRST , +PCIE_GLI_9767_UHS2_CTL1_PDRST_VALUE ); +pci_write_config_dword (pdev,PCIE_GLI_9767_UHS2_CTL1 , value); + +pci_read_config_dword (pdev,PCIE_GLI_9767_UHS2_CTL2 , &value); + value |=FIELD_PREP (PCIE_GLI_9767_UHS2_CTL2_ZC , +PCIE_GLI_9767_UHS2_CTL2_ZC_VALUE ) | +FIELD_PREP (PCIE_GLI_9767_UHS2_CTL2_ZC_CTL , +PCIE_GLI_9767_UHS2_CTL2_ZC_CTL_VALUE ); +pci_write_config_dword (pdev,PCIE_GLI_9767_UHS2_CTL2 , value); + +gl9767_vhs_read (pdev); +} + +static void sdhci_gl9767_set_power (struct sdhci_host *host,unsigned char mode,unsigned short vdd) +{ +struct sdhci_pci_slot *slot =sdhci_priv (host); +struct pci_dev *pdev = slot->chip->pdev; +u32 value; + +if (mmc_card_uhs2 (host->mmc)) { +gl9767_vhs_write (pdev); + +pci_read_config_dword (pdev,PCIE_GLI_9767_SD_DATA_MULTI_CTL , &value); + value |=PCIE_GLI_9767_SD_DATA_MULTI_CTL_SELECT_UHS2 | +PCIE_GLI_9767_SD_DATA_MULTI_CTL_UHS2_SWITCH_CTL ; +pci_write_config_dword (pdev,PCIE_GLI_9767_SD_DATA_MULTI_CTL , value); + +gl9767_vhs_read (pdev); + +sdhci_gli_overcurrent_event_enable (host, false); +sdhci_uhs2_set_power (host, mode, vdd); +sdhci_gli_overcurrent_event_enable (host, true); + }else { +gl9767_vhs_write (pdev); + +pci_read_config_dword (pdev,PCIE_GLI_9767_SD_DATA_MULTI_CTL , &value); + value &= ~(PCIE_GLI_9767_SD_DATA_MULTI_CTL_SELECT_UHS2 | +PCIE_GLI_9767_SD_DATA_MULTI_CTL_UHS2_SWITCH_CTL ); +pci_write_config_dword (pdev,PCIE_GLI_9767_SD_DATA_MULTI_CTL , value); + +gl9767_vhs_read (pdev); + +sdhci_gli_overcurrent_event_enable (host, false); +sdhci_set_power (host, mode, vdd); +sdhci_gli_overcurrent_event_enable (host, true); + } +} +static int gli_probe_slot_gl9750 (struct sdhci_pci_slot *slot) {struct sdhci_host *host = slot->host;
@@ -1328,6 +1520,7 @@ static int gli_probe_slot_gl9767(struct sdhci_pci_slot *slot) host->mmc->caps2 |=MMC_CAP2_SD_EXP ; host->mmc_host_ops.init_sd_express = gl9767_init_sd_express;sdhci_enable_v4_mode (host); +gl9767_vendor_init (host);return 0 ; }
@@ -1831,12 +2024,20 @@ static const struct sdhci_ops sdhci_gl9767_ops = { .reset = sdhci_gl9767_reset, .set_uhs_signaling = sdhci_set_uhs_signaling, .voltage_switch = sdhci_gl9767_voltage_switch, + .dump_uhs2_regs = sdhci_uhs2_dump_regs, + .set_timeout = sdhci_uhs2_set_timeout, + .irq = sdhci_uhs2_irq, + .set_power = sdhci_gl9767_set_power, + .uhs2_pre_detect_init = sdhci_gli_pre_detect_init, + .card_event = sdhci_gl9767_card_event, };const struct sdhci_pci_fixes sdhci_gl9767 = { .quirks =SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC , .quirks2 =SDHCI_QUIRK2_BROKEN_DDR50 , .probe_slot = gli_probe_slot_gl9767, + .add_host = sdhci_pci_uhs2_add_host, + .remove_host = sdhci_pci_uhs2_remove_host, .ops = &sdhci_gl9767_ops, #ifdef CONFIG_PM_SLEEP .resume = sdhci_pci_gli_resume,
Signature · 1 line
2.25.1
Adrian Hunter
maintainerQuoted 6 lines · Victor Shih
From: Victor Shih <[email protected]>
Summary
=======
These patches[1] support UHS-II and fix GL9755 and GL9767 UHS-II compatibility.
As before, one small thing (see reply to the relevent email) but, as I wrote for V17, V18, and V19 this is essentially OK from my point of view.
Quoted 1,232 lines
About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.Patch structure
===============
patch#1-#7: for core
patch#8-#20: for sdhci
patch#21: for GL9755
patch#22: for GL9767Tests
=====
Ran 'dd' command to evaluate the performance 3 times:
(SanDisk UHS-II card on GL9755 controller)
Read Write
UHS-II disabled (UHS-I): 84.5MB/s 54.1MB/s
UHS-II enabled : 190MB/s 74.4MB/s
Read Write
UHS-II disabled (UHS-I): 85.4MB/s 56.2MB/s
UHS-II enabled : 169MB/s 75.2MB/s
Read Write
UHS-II disabled (UHS-I): 83.3MB/s 54.2MB/s
UHS-II enabled : 187MB/s 77.1MB/s
(SanDisk UHS-II card on GL9767 controller)
Read Write
UHS-II disabled (UHS-I): 84.9MB/s 56.5MB/s
UHS-II enabled : 189MB/s 76.4MB/s
Read Write
UHS-II disabled (UHS-I): 85.2MB/s 48.5MB/s
UHS-II enabled : 209MB/s 75.4MB/s
Read Write
UHS-II disabled (UHS-I): 85.6MB/s 50.2MB/s
UHS-II enabled : 185MB/s 78.3MB/sTest command
=====
Read: dd if=/dev/mmcxxx of=/dev/null bs=4096k count=2000 iflag=direct Write:dd if=/dev/zero of=/dev/mmcxxx bs=4096k count=2000 oflag=directChanges in v20 (September. 05, 2024)
* Rebase on latest mmc/next.
* Patch#21: Removesdhci_gli_enable_internal_clockfuncton unusedclk_ctrlvariable.
Make a functionsdhci_gli_wait_software_reset_done()for gl9755 reset.
* Patch#22: Use the functionsdhci_gli_wait_software_reset_done()for gl9767 reset.Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/----------------- original cover letter from v19 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 and GL9767 UHS-II compatibility.About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.Patch structure
===============
patch#1-#7: for core
patch#8-#20: for sdhci
patch#21: for GL9755
patch#22: for GL9767Tests
=====
Ran 'dd' command to evaluate the performance:
(SanDisk UHS-II card on GL9755 controller)
Read Write
UHS-II disabled (UHS-I): 84.8MB/s 53.6MB/s
UHS-II enabled : 183MB/s 90.8MB/s
(SanDisk UHS-II card on GL9767 controller)
Read Write
UHS-II disabled (UHS-I): 83.3MB/s 51.6MB/s
UHS-II enabled : 202MB/s 73.3MB/sChanges in v19 (August. 29, 2024)
* Rebase on latest mmc/next.
* Patch#16:cmd->uhs2_cmd->uhs2_respis always true, remove it from safety check in the__sdhci_uhs2_finish_command().
* Patch#17: Correctedsdhci_uhs2_reset()parameter errors in thesdhci_uhs2_request_done().
* Patch#21: Addsdhci_gli_enable_internal_clock()to simplify the codein the sdhci_gl9755_reset().* Patch#22: Use
sdhci_gli_enable_internal_clock()to simplify the code in thesdhci_gl9767_reset().
Directly reading theSDHCI_PRESENT_STATEregister to replace theget_cd()avoids the possibility of theget_cd()sleeping in thesdhci_gl9767_set_card_detect_debounce_time(). Refine the position ofgli_set_9767()in thesdhci_gl9767_reset().Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/----------------- original cover letter from v18 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 and GL9767 UHS-II compatibility.About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.Patch structure
===============
patch#1-#7: for core
patch#8-#20: for sdhci
patch#21: for GL9755
patch#22: for GL9767Tests
=====
Ran 'dd' command to evaluate the performance:
(SanDisk UHS-II card on GL9755 controller)
Read Write
UHS-II disabled (UHS-I): 83.9MB/s 48.6MB/s
UHS-II enabled : 199MB/s 74.3MB/s
(SanDisk UHS-II card on GL9767 controller)
Read Write
UHS-II disabled (UHS-I): 83.6MB/s 50.1MB/s
UHS-II enabled : 183MB/s 77.8MB/sChanges in v18 (August. 02, 2024)
* Rebase on latest mmc/next.
* Patch#17: Modify the judgment condition insdhci_uhs2_reset_cmd_data()and replace it frommmc_card_uhs2()
tohost->mmc->uhs2_sd_tranflag.
* Patch#22: Add new register settings for gl9767.
Addcard_eventin thesdhci_opsfor gl9767.
Addsdhci_gl9767_set_card_detect_debounce_time()to configure the gl9767.
Adjust thesdhci_gl9767_reset()process for gl9767.Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/----------------- original cover letter from v17 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 and GL9767 UHS-II compatibility.About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.Patch structure
===============
patch#1-#7: for core
patch#8-#20: for sdhci
patch#21: for GL9755
patch#22: for GL9767Changes in v17 (June. 20, 2024)
* Rebase on latest mmc/next.
* Drop patch#8 of uhs2 patches series v16.
* Patch#11: Move thesdhci_uhs2_reset_cmd_data()to the other patch it was used for the first time.
* Patch#12: Exportsdhci_uhs2_set_power()function.
* Patch#16: Add new parameter to__sdhci_finish_data_common().
* Patch#17: Addsdhci_uhs2_reset_cmd_data()andsdhci_uhs2_needs_reset()to resolve the data error or cmd error.
* Patch#21: Rnamegl9755_overcurrent_event_enable()tosdhci_gli_overcurrent_event_enable().
* Patch#22: Usemmc_card_uhs2()to simplify the code in thesdhci_gl9767_reset(). Use mmc_card_uhs2() to simplify the code in the sdhci_gl9767_set_power(). Add sdhci_gli_overcurrent_event_enable() to sdhci_gl9767_set_power().Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/----------------- original cover letter from v16 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 and GL9767 UHS-II compatibility.About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.Patch structure
===============
patch#1-#8: for core
patch#9-#21: for sdhci
patch#22: for GL9755
patch#23: for GL9767Changes in v16 (May. 22, 2024)
* rebased to the linux-kernel-v6.9.0-rc2 in Ulf Hansson next branch.
* according to the comments provided by Adrian Hunter to modify the patches base on the [V14 00/21] Add support UHS-II for GL9755.
* Patch#8: Separate the Error Recovery mechanism from patch#7 to patch#8.
* Patch#16: Remove irrelevant definition in thesdhci_calc_timeout_uhs2().Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/----------------- original cover letter from v15 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 and GL9767 UHS-II compatibility.About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.Patch structure
===============
patch#1-#7: for core
patch#8-#20: for sdhci
patch#21: for GL9755
patch#22: for GL9767Changes in v15 (April. 22, 2024)
* rebased to the linux-kernel-v6.9.0-rc2 in Ulf Hansson next branch.
* according to the comments provided by Adrian Hunter to modify the patches base on the [V14 00/21] Add support UHS-II for GL9755.
* Patch#07: Move structuhs2_commanduhs2_cmdto structmmc_requestand modify whatever other changers to make it work. Refer the SD Host Controller Standard Specification Section 3.10 to add Error Recovery mechanism to recover the command error.
* Patch#11: Refer the SD Host Controller Standard Specification Section 3.10 to add reset command data mechanism.
* Patch#15: Resolve merge conflicts and reduce unnecessary line breaks.
* Patch#16: Adjust the parameters used in the__sdhci_uhs2_finish_command()to match changes in the Patch#7.
* Patch#21: Adjustgl9755_vendor_init()to the correct function.
* Patch#22: Add gl9767 to support uhs2 function.Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/----------------- original cover letter from v14 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.Patch structure
===============
patch#1-#7: for core
patch#8-#20: for sdhci
patch#21: for GL9755Changes in v14 (January. 23, 2024)
* rebased to the linux-kernel-v6.7.0-rc4 in Ulf Hansson next branch.
* according to the comments provided by Adrian Hunter to modify the patches base on the [V13 00/21] Add support UHS-II for GL9755.
* Patch#03: Movemmc_card_uhs2()toinclude/linux/mmc/host.h, so thatmmc_card_uhs2()can be available for host drivers.
* Patch#10: Usemmc_card_uhs2()to steadsdhci_uhs2_mode()in thesdhci_uhs2_dump_regs().* Patch#11: Since
mmc_card_uhs2()is the same assdhci_uhs2_mode(), so dropsdhci_uhs2_mode()and usemmc_card_uhs2()instead ofsdhci_uhs2_mode().
* Patch#13: Usemmc_card_uhs2()to steadsdhci_uhs2_mode()in thesdhci_uhs2_set_timeout(). * Patch#14: Use mmc_card_uhs2() to stead sdhci_uhs2_mode() in the sdhci_uhs2_set_ios(). * Patch#16: Use mmc_card_uhs2() to stead sdhci_uhs2_mode() in the sdhci_uhs2_request().* Patch#17: Use
mmc_card_uhs2()to steadsdhci_uhs2_mode()in thesdhci_uhs2_complete_work(),sdhci_uhs2_irq()andsdhci_uhs2_thread_irq().
* Patch#18: Usemmc_card_uhs2()to steadsdhci_uhs2_mode()in the__sdhci_uhs2_remove_host().Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/----------------- original cover letter from v13 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.Patch structure
===============
patch#1-#7: for core
patch#8-#20: for sdhci
patch#21: for GL9755Changes in v13 (November. 17, 2023)
* rebased to the linux-kernel-v6.7.0-rc1 in Ulf Hansson next branch.
* according to the comments provided by Adrian Hunter to modify the
patches base on the [V12 00/23] Add support UHS-II for GL9755.
* according to the comments provided by Ulf Hansson to modify the
patches base on the [V12 00/23] Add support UHS-II for GL9755.
* Add new patch#6 to re-factoring the code.
* Patch#7: Separate__mmc_go_idle()into one patch for re-factorring the code. Movemmc_decode_scrdeclaration tosd.h.
Uesuhs2_sd_tranto steadMMC_UHS2_SD_TRAN.
Drop unnecessary comment.
* Patch#11: Use ios timing to steadMMC_UHS2_SUPPORTfor indicate the UHS2 mode.
* Patch#12: Drop use vmmc2.
Modify comment message.
* Patch#13: Modify comment message.
* Patch#14: Add judgment condition for power mode in the__sdhci_uhs2_set_ios(). Modify comment message.
* Patch#15: Merge Patch#15, Patch#16 and Patch#17 of v12 version into Patch#15 in v13 version. Use definitions to simplify code.
Modify comment message.
* Patch#16: Re-order function to avoid declaration.
Remove unnecessary function.
* Patch#17: Re-order function to avoid declaration.
Remove unnecessary definitions.
* Patch#18: Re-order function to avoid declaration.
Use vqmmc2 to stead vmmc2.
* Patch#21: Uesuhs2_sd_tranto steadMMC_UHS2_SD_TRAN.Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/----------------- original cover letter from v12 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.Patch structure
===============
patch#1-#6: for core
patch#7-#22: for sdhci
patch#23: for GL9755Changes in v12 (September. 15, 2023)
* rebased to the linux-kernel-v6.6.0-rc1 in Ulf Hansson next branch.
* according to the comments provided by Adrian Hunter to modify the patches base on the [V11 00/23] Add support UHS-II for GL9755.
* according to the comments provided by Ulf Hansson to modify the patches base on the [V11 00/23] Add support UHS-II for GL9755.
* Patch#5: Remove unusedmax_current_180_vdd2.
* Patch#6: Usemmc_op_multi()to check DCMD which supports multi read/write inmmc_uhs2_prepare_cmd().Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/----------------- original cover letter from v11 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.Patch structure
===============
patch#1-#6: for core
patch#7-#22: for sdhci
patch#23: for GL9755Changes in v11 (September. 08, 2023)
* rebased to the linux-kernel-v6.5.0-rc5 in Ulf Hansson next branch.
* according to the comments provided by Adrian Hunter to modify the patches base on the [V10 00/23] Add support UHS-II for GL9755.
* Patch#18: Drop the checkmmc_card_uhs2_hd_mode(host->mmc)insdhci_uhs2_set_transfer_mode().
* Patch#20: Remove unusedocr_avail_uhs2.Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/----------------- original cover letter from v10 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.Patch structure
===============
patch#1-#6: for core
patch#7-#22: for sdhci
patch#23: for GL9755Changes in v10 (August. 18, 2023)
* rebased to the linux-kernel-v6.5.0-rc5 in Ulf Hansson next branch.
* according to the comments provided by Ulf Hansson to modify the patches base on the [V9 00/23] Add support UHS-II for GL9755.
* Patch#2: Drop unnecessary definitions and code.
* Patch#3: Modify the commit message.
* Patch#4: Modify the commit message.
* Patch#5: Drop unnecessary definitions.
* Patch#6: Move some definitions of PatchV9[02/23] to PatchV10[06/23]. Move some definitions of PatchV9[05/23] to PatchV10[06/23]. Dropdo_multiin themmc_blk_rw_rq_prep().
Usetmode_half_duplexto instead ofuhs2_tmode0_flag. Move entire control of the tmode intommc_uhs2_prepare_cmd().
* Patch#11: Move some definitions of PatchV9[05/23] to PatchV10[11/23].
* Patch#18: Usetmode_half_duplexto instead ofuhs2_tmode0_flaginsdhci_uhs2_set_transfer_mode().
* Patch#20: Move some definitions of PatchV9[05/23] to PatchV10[20/23].Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/----------------- original cover letter from v9 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.Patch structure
===============
patch#1-#6: for core
patch#7-#22: for sdhci
patch#23: for GL9755Changes in v9 (July. 21, 2023)
* rebased to the linux-kernel-v6.5.0-rc1 in Ulf Hansson next branch.
* according to the comments provided by Adrian Hunter to modify the patches base on the [V8 00/23] Add support UHS-II for GL9755.
* Patch#2: movesd_uhs2_operationdefinition of PatchV8[05/23] to PatchV9[02/23] for avoid compilation errors.
moveuhs2_controldefinition of PatchV8[05/23]
to PatchV9[02/23] for avoid compilation errors.
movemmc_hostflags definition of PatchV8[05/23]
to PatchV9[02/23] for avoid compilation errors.
movemmc_hostflagsMMC_UHS2_SUPPORTdefinition of PatchV8[05/23] to PatchV9[02/23] for avoid compilation errors. movemmc_hostflagsMMC_UHS2_SD_TRANdefinition of PatchV8[05/23] to PatchV9[02/23] for avoid compilation errors.
* Patch#7: Modify the commit message.
* Patch#8: Modify the commit message.
* Patch#11: Modify annotations insdhci_get_vdd_value().
* Patch#14: Simplity theturning_on_clkinsdhci_set_ios().
* Patch#18: Modify the annotations in__sdhci_uhs2_send_command().
* Patch#19: Cancel export state ofsdhci_set_mrq_done()function.
* Patch#23: Renamegl9755_pre_detect_init()tosdhci_gli_pre_detect_init().Rename gl9755_uhs2_reset_sd_tran() to sdhci_gli_uhs2_reset_sd_tran().Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/----------------- original cover letter from v8 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence[2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence [2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.Patch structure
===============
patch#1-#6: for core
patch#7-#22: for sdhci
patch#23: for GL9755Changes in v8 (June. 21, 2023)
* rebased to the linux-kernel-v6.4.0-rc6 in Ulf Hansson next branch.
* fix most of checkpatch warnings/errors.
* according to the comments provided by Adrian Hunter to modify the patches base on the [V7 00/23] Add support UHS-II for GL9755.
* Patch#6: AddMMC_UHS2_SUPPORTto be cleared insd_uhs2_detect(). Modify return value insd_uhs2_attach().
* Patch#7: Use tabs instead of spaces.
* Patch#8: ModifyMODULE_LICENSEfrom "GPL v2" to "GPL".
* Patch#10: Adjust the position of matching brackets.
* Patch#11: Adjust the position of matching brackets.
Add the initial value of the pwr insdhci_uhs2_set_power().
* Patch#13: Initialization be combined with declaration and realigned insdhci_calc_timeout_uhs2().
Forward declare structmmc_commandinsdhci_uhs2.h.
* Patch#14: Add the judgment formula forMMC_TIMING_SPEED_A_HD,MMC_TIMING_SPEED_BandMMC_TIMING_SPEED_B_HDin__sdhci_uhs2_set_ios().
Add the switch case forMMC_TIMING_SPEED_A_HD,MMC_TIMING_SPEED_BandMMC_TIMING_SPEED_B_HDinsdhci_get_preset_value().mmc_opt_regulator_set_ocr()to instead ofmmc_regulator_set_ocr()insdhci_uhs2_set_ios().
* Patch#15:usleep_range()to instead ofudelay()insdhci_uhs2_interface_detect().read_poll_timeout()to instead ofread_poll_timeout_atomic()insdhci_uhs2_interface_detect().
Modify return value insdhci_uhs2_do_detect_init().
* Patch#16: Remove unnecessary include file.read_poll_timeout()to instead ofread_poll_timeout_atomic()insdhci_uhs2_enable_clk().
Put the comment on the end and put the lines in descending line length insdhci_uhs2_enable_clk().
Modify return value insdhci_uhs2_enable_clk().
* Patch#17: Reorder the definitions and lose the parentheses insdhci_uhs2_set_config().
read_poll_timeout()to instead ofread_poll_timeout_atomic()insdhci_uhs2_check_dormant().
* Patch#18: Adjust the position of matching brackets insdhci_uhs2_send_command_retry().
Modify CameCase definition in__sdhci_uhs2_finish_command(). Modify error message in__sdhci_uhs2_finish_command().sdhci_uhs2_send_command_retry()to instead ofsdhci_uhs2_send_command()insdhci_uhs2_request(). Usesdhci_uhs2_mode()to simplify code insdhci_uhs2_request_atomic().
Add forward declaration forsdhci_send_command().
* Patch#19: Forward declare structmmc_requestinsdhci_uhs2.h. Remove forward declaration ofsdhci_send_command(). Usemmc_dev()to simplify code insdhci_request_done_dma().
* Patch#20: Change return type to void for__sdhci_uhs2_add_host_v4(). Remove unused variables in__sdhci_uhs2_add_host_v4().
* Patch#22: Add config selectMMC_SDHCI_UHS2inKconfig.
* Patch#23: Usesdhci_get_vdd_value()to simplify code ingl9755_set_power().
Useread_poll_timeout_atomic()to simplify code insdhci_wait_clock_stable().
Useread_poll_timeout_atomic()to simplify code insdhci_gl9755_reset().Reference
=========
[1] https://gitlab.com/VictorShih/linux-uhs2.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/----------------- original cover letter from v7 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence [2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence[2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.Patch structure
===============
patch#1-#6: for core
patch#7-#22: for sdhci
patch#23: for GL9755Changes in v7 (Mar. 31, 2023)
* rebased to the linux-kernel-v6.3.0-rc3 in Ulf Hansson next branch.
* according to the guidance and overall architecture provided by Ulf Hansson, Ben Chuang and Jason Lai to implement the UHS-2 Core function based on the patches of the [V4,0/6] Preparations to support SD UHS-II cards[5].
* according to the guidance and comments provided by Adrian Hunter, Ben Chuang and AKASHI Takahiro to implement the UHS-2 Host function based on the patches of the [RFC,v3.1,00/27] Add support UHS-II for GL9755[4].
* implement the necessary function to let the UHS-2 Core/Host work properly.
* fix most of checkpatch warnings/errors.
* according to the guidance and comments provided by Adrian Hunter, Ben Chuang to implement the UHS-2
Host function based on the patches of the
[V5,00/26] Add support UHS-II for GL9755[6].
* according to the guidance and comments provided by
Ulf Hanssion, Adrian Hunter, Ben Chuang to implement the UHS-2 Host function based on the patches of the
[V6,00/24] Add support UHS-II for GL9755[7].
* Theuhs2_post_attach_sd()function is no longer needed so drop the V6 version of the Patch#22.
* Modifies the usage of the flags used by the sdhci host forMMC_UHS2_INITIALIZED.
* Patch#1: Drop unnecessary bracket.
* Patch#2: Dropsd_uhs2_set_iosfunction.Used ->uhs2_control() callback for uhs2_set_ios in sd_uhs2_power_up(). Used ->uhs2_control() callback for uhs2_set_ios in sd_uhs2_power_off(). Drop MMC_TIMING_SD_UHS2 in favor of MMC_TIMING_UHS2_SPEED_A. Modify sd_uhs2_legacy_init to avoid the sd_uhs2_reinit cycle issue. * Patch#5: Drop unnecessary definitions. * Patch#6: Drop unnecessary function. Drop uhs2_state in favor of ios->timing.* Patch#7: Reorder values and positions of definitions.
* Patch#9: Usedsdhci_uhs2_modefunction to simplify.
* Patch#11: Drop pwr variable insdhci_uhs2_set_powerfunction.
* Patch#14: Modify some descriptions.
Drop unnecessary function.
* Patch#15: Drop usinguhs2_resetops and usesdhci_uhs2_resetfunction in thesdhci_do_detect_initfunction.
* Patch#17: Drop unnecessary function.
* Patch#18: Drop unnecessary whitespace changes.
Cancel the export state of some functions.
* Patch#19: Drop unnecessary function.
Usedsdhci_uhs2_modefunction to simplify. Modify some descriptions.
Cancel the export state of some functions.
* Patch#20: Drop using__sdhci_uhs2_hostfunction and use__sdhci_add_hostfunction insdhci_uhs2_add_hostfunction. Cancel the export state of some functions.
* Patch#23: Drop usinguhs2_post_attach_sdfunction.Reference
=========
[1] https://gitlab.com/ben.chuang/linux-uhs2-gl9755.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
[5] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
[6] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
[7] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/----------------- original cover letter from v6 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence [2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence[2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.Patch structure
===============
patch#1-#6: for core
patch#7-#23: for sdhci
patch#24: for GL9755Changes in v6 (Dec. 12, 2022)
* rebased to the linux-kernel-v6.1.0-rc8 in Ulf Hansson next branch.
* according to the guidance and overall architecture provided by Ulf Hansson, Ben Chuang and Jason Lai to implement the UHS-2 Core function based on the patches of the [V4,0/6] Preparations to support SD UHS-II cards[5].
* according to the guidance and comments provided by Adrian Hunter, Ben Chuang and AKASHI Takahiro to implement the UHS-2 Host function based on the patches of the [RFC,v3.1,00/27] Add support UHS-II for GL9755[4].
* implement the necessary function to let the UHS-2 Core/Host work properly.
* fix most of checkpatch warnings/errors.
* according to the guidance and comments provided by Adrian Hunter, Ben Chuang to implement the UHS-2
Host function based on the patches of the
[V5,00/26] Add support UHS-II for GL9755[6].
* Theuhs2_post_attach_sd()has implemented in Patch#6 and Patch#17 so drop the V5 version of the Patch#23.
* Modifies the usage of the flags used by the sdhci host forMMC_UHS2_INITIALIZED.
* Patch#5: Drop unused definitions and functions.
* Patch#7: Rename definitions.
UseBIT()GENMASK()in some cases.
* Patch#8: Merge V5 version of Patch[7] and Patch[9] into V6 version of Patch[8].
* Patch#9: Drop unnecessary function.
Rename used definitions.
* Patch#10: Drop unnecessary function and simplify some code.
* Patch#11: Drop unnecessary function.
Add newmmc_opt_regulator_set_ocrfunction.
* Patch#13: Drop unnecessary function.
UseGENMASK()andFIELD_PREP()in some cases.
* Patch#14: Drop unnecessary function.
Modify return value in some function.
UseGENMASK()andFIELD_PREP()in some cases.
* Patch#15: Drop unnecessary function.
Rename used definitions.
UseGENMASK()andFIELD_GET()in some cases. Wrap at 100 columns in some functions.
* Patch#16: Drop unnecessary function.
* Patch#17: Drop unnecessary function.
Drop the unnecessary parameter when call theDBG()function.
Rename used definitions.
Cancel the export state of some functions. UseGENMASK()andFIELD_PREP()in some cases.
* Patch#18: Drop unnecessary function.
Adduhs2_dev_cmdfunction to simplify some functions. Rename used definitions.
Cancel the export state of some functions. UseGENMASK()andFIELD_PREP()in some cases.
* Patch#19: Drop unnecessary function.
Addsdhci_uhs2_mode()in some functions. Rename used definitions.
Cancel the export state of some functions.
* Patch#20: Add new complete_work_fn/thread_irq_fn variables in structsdhci_host.
Use complete_work_fn/thread_irq_fn variables in sdhci_alloc_host()/sdhci_uhs2_add_host(). Rename used definitions.
* Patch[24]: Rename used definitions.Reference
=========
[1] https://gitlab.com/ben.chuang/linux-uhs2-gl9755.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
[5] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
[6] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/----------------- original cover letter from v5 ----------------- Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence [2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence[2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.Patch structure
===============
patch#1-#6: for core
patch#7-#25: for sdhci
patch#26: for GL9755Changes in v5 (Oct. 19, 2022)
* rebased to the linux-kernel-v6.1-rc1 in Ulf Hansson next branch.
* according to the guidance and overall architecture provided by Ulf Hansson, Ben Chuang and Jason Lai to implement the UHS-2 Core function based on the patches of the [V4,0/6] Preparations to support SD UHS-II cards[5].
* according to the guidance and comments provided by Adrian Hunter, Ben Chuang and AKASHI Takahiro to implement the UHS-2 Host function based on the patches of the [RFC,v3.1,00/27] Add support UHS-II for GL9755[4].
* implement the necessary function to let the UHS-2 Core/Host work properly.
* fix most of checkpatch warnings/errorsReference
=========
[1] https://gitlab.com/ben.chuang/linux-uhs2-gl9755.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02
[4] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/
[5] https://patchwork.kernel.org/project/linux-mmc/cover/[email protected]/----------------- original cover letter from v3.1 ----------------- This is an interim snapshot of our next version, v4, for enabling UHS-II on MMC/SD.
It is focused on 'sdhci' side to address Adrian's comments regarding "modularising"
sdhci-uhs2.c.
The whole aim of this version is to get early feedback from Adrian (and others) on this issue. Without any consensus about the code structure, it would make little sense to go further ahead on sdhci side. (Actually, Adrian has made no comments other than "modularising" so far.)I heavily reworked/refactored
sdhci-uhs2.cand re-organised the patch set to meet what I believe Adrian expects; no UHS-II related code in Legacy (UHS-I) code orsdhci.c.Nevertheless, almost of all changes I made are trivial and straightforward in this direction, and I believe that there is no logic changed since v3 except
sdhci_uhs2_irq(), asops->irqhook, where we must deal with UHS-II command sequences in addition to UHS-II errors. So I added extra handlings.I admit that there is plenty of room for improvements (for example, handling
host->flags), but again the focal point here is howsdhci-uhs2.cshould be built as a module.Please review this series (particularly Patch#8-#26 and #27) from this viewpoint in the first place.
(Ben is working on 'host' side but there is no change on 'host' side in this submission except a minor tweak.)Thanks,
-Takahiro Akashi------ original cover letter from v3 ------
Summary
=======
These patches[1] support UHS-II and fix GL9755 UHS-II compatibility.About UHS-II, roughly deal with the following three parts:
1) A UHS-II detection and initialization:
- Host setup to support UHS-II (Section 3.13.1 Host Controller Setup Sequence [2]).
- Detect a UHS-II I/F (Section 3.13.2 Card Interface Detection Sequence[2]).
- In step(9) of Section 3.13.2 in [2], UHS-II initialization is include Section 3.13.3 UHS-II Card Initialization and Section 3.13.4 UHS-II Setting Register Setup Sequence.2) Send Legacy SD command through SD-TRAN
- Encapsulated SD packets are defined in SD-TRAN in order to ensure Legacy SD compatibility and preserve Legacy SD infrastructures (Section 7.1.1 Packet Types and Format Overview[3]).
- Host issue a UHS-II CCMD packet or a UHS-II DCMD (Section 3.13.5 UHS-II CCMD Packet issuing and Section 3.13.6 UHS-II DCMD Packet issuing[2]).3) UHS-II Interrupt
- Except for UHS-II error interrupts, most interrupts share the original interrupt registers.Patch structure
===============
patch#1-#7: for core
patch#8-#17: for sdhci
patch#18-#21: for GL9755Tests
=====
Ran 'dd' command to evaluate the performance:
(SanDisk UHS-II card on GL9755 controller)
Read Write
UHS-II disabled (UHS-I): 88.3MB/s 60.7MB/s
UHS-II enabled : 206MB/s 80MB/sTODO
====
- replace some define with BIT macroReference
=========
[1] https://gitlab.com/ben.chuang/linux-uhs2-gl9755.git
[2] SD Host Controller Simplified Specification 4.20
[3] UHS-II Simplified Addendum 1.02Changes in v3 (Jul. 10, 2020)
* rebased to v5.8-rc4
* add copyright notice
* reorganize the patch set and split some commits into smaller ones
* separate uhs-2 headers from others
* correct wrong spellings
* fix most of checkpatch warnings/errors
* remove all k[cz]alloc() from the code
* guard sdhci-uhs2 specific code with'if (IS_ENABLED(CONFIG_MMC_SDHCI_UHS2))'* make
sdhci-uhs2.cas a module
* trivial changes, including
- rename backsdhci-core.ctosdhci.c
- allow vendor code to disable uhs2 ifv4_mode== 0in __sdhci_add_host()- merge
uhs2_power_up()intommc_power_up()
- removeflag_uhs2frommmc_attach_sd()
- add function descriptions to EXPORT'ed functions
- other minor code optimizationChanges in v2 (Jan. 9, 2020)
* rebased to v5.5-rc5Ben Chuang (1):
mmc: sdhci-uhs2: add pre-detect_init hookUlf Hansson (4):
mmc: core: Cleanup printing of speed mode at card insertion
mmc: core: Prepare to support SD UHS-II cards
mmc: core: Announce successful insertion of an SD UHS-II card
mmc: core: Extend support for mmc regulators with a vqmmc2Victor Shih (17):
mmc: core: Add definitions for SD UHS-II cards
mmc: core: Add New function to re-factoring the code
mmc: core: Support UHS-II card control and access
mmc: sdhci: add UHS-II related definitions in headers
mmc: sdhci: add UHS-II module and add a kernel configuration
mmc: sdhci-uhs2: dump UHS-II registers
mmc: sdhci-uhs2: add reset function
mmc: sdhci-uhs2: addset_power()to support vdd2
mmc: sdhci-uhs2: addset_timeout()
mmc: sdhci-uhs2: addset_ios()
mmc: sdhci-uhs2: adduhs2_control()to initialise the interface
mmc: sdhci-uhs2: addrequest()and others
mmc: sdhci-uhs2: addirq()and others
mmc: sdhci-uhs2: addadd_host()and others to set up the driver
mmc: sdhci-pci: add UHS-II support framework
mmc: sdhci-pci-gli: enable UHS-II mode for GL9755
mmc: sdhci-pci-gli: enable UHS-II mode for GL9767drivers/mmc/core/Makefile | 2 +- drivers/mmc/core/bus.c | 38 +- drivers/mmc/core/core.c | 23 +- drivers/mmc/core/core.h | 1 + drivers/mmc/core/mmc_ops.c | 24 +- drivers/mmc/core/mmc_ops.h | 1 + drivers/mmc/core/regulator.c | 34 + drivers/mmc/core/sd.c | 10 +- drivers/mmc/core/sd.h | 5 + drivers/mmc/core/sd_ops.c | 9 + drivers/mmc/core/sd_ops.h | 13 + drivers/mmc/core/sd_uhs2.c | 1326 +++++++++++++++++++++++++++++ drivers/mmc/host/Kconfig | 10 + drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-pci-core.c | 16 +- drivers/mmc/host/sdhci-pci-gli.c | 439 +++++++++- drivers/mmc/host/sdhci-pci.h | 3 + drivers/mmc/host/sdhci-uhs2.c | 1273 +++++++++++++++++++++++++++ drivers/mmc/host/sdhci-uhs2.h | 190 +++++ drivers/mmc/host/sdhci.c | 281 +++--- drivers/mmc/host/sdhci.h | 75 +- include/linux/mmc/card.h | 36 + include/linux/mmc/core.h | 17 + include/linux/mmc/host.h | 80 ++ include/linux/mmc/sd_uhs2.h | 240 ++++++ 25 files changed, 3998 insertions(+), 149 deletions(-) create mode 100644 drivers/mmc/core/sd_uhs2.c create mode 100644 drivers/mmc/host/sdhci-uhs2.c create mode 100644 drivers/mmc/host/sdhci-uhs2.h create mode 100644 include/linux/mmc/sd_uhs2.h