Skip to content

Commit 301420a

Browse files
P33Mpelwell
authored andcommitted
DT: bcm2712: override supports-cqe to a cell
We want to be able to control the interop surface exposed by Command Queueing across bcm2712 products to a more restrictive default, with selectable disable and permissive behaviour. Changing the bool to a cell lets it relay a tristate value. Also add the override parameter to CM5 as CM5-lite may interface with arbitrary eMMC or SD cards. Signed-off-by: Jonathan Bell <[email protected]>
1 parent 14c5fee commit 301420a

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

arch/arm/boot/dts/overlays/README

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,9 +405,14 @@ Params:
405405
non-lite SKU of CM4).
406406
(default "on")
407407

408-
sd_cqe Set to "off" to disable Command Queueing if you
409-
have an incompatible Class A2 SD card
410-
(Pi 5 only, default "on")
408+
sd_cqe Modify Command Queuing behaviour on the main SD
409+
interface. Legal values are:
410+
0: disable CQ
411+
1: allow CQ for known-good SD A2 cards, and all
412+
eMMC cards
413+
2: allow CQ for all SD A2 cards that aren't
414+
known-bad, and all eMMC cards.
415+
(2712 only, default "1")
411416

412417
sd_overclock Clock (in MHz) to use when the MMC framework
413418
requests 50MHz

arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ dpi_16bit_gpio2: &rp1_dpi_16bit_gpio2 { };
365365
sd-uhs-sdr50;
366366
sd-uhs-ddr50;
367367
sd-uhs-sdr104;
368-
supports-cqe;
368+
supports-cqe = <1>;
369369
cd-gpios = <&gio_aon 5 GPIO_ACTIVE_LOW>;
370370
//no-1-8-v;
371371
status = "okay";
@@ -745,6 +745,6 @@ spi10_cs_pins: &spi10_cs_gpio1 {};
745745

746746
/ {
747747
__overrides__ {
748-
sd_cqe = <&sdio1>, "supports-cqe?";
748+
sd_cqe = <&sdio1>, "supports-cqe:0";
749749
};
750750
};

arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ dpi_16bit_gpio2: &rp1_dpi_16bit_gpio2 { };
339339
mmc-hs400-1_8v;
340340
mmc-hs400-enhanced-strobe;
341341
broken-cd;
342-
supports-cqe;
342+
supports-cqe = <1>;
343343
status = "okay";
344344
};
345345

@@ -752,5 +752,6 @@ spi10_cs_pins: &spi10_cs_gpio1 {};
752752
<&ant2>, "output-low?=on";
753753
noanthogs = <&ant1>,"status=disabled",
754754
<&ant2>, "status=disabled";
755+
sd_cqe = <&sdio1>, "supports-cqe:0";
755756
};
756757
};

arch/arm64/boot/dts/broadcom/bcm2712.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1210,7 +1210,7 @@
12101210
clocks = <&clk_emmc2>;
12111211
sdhci-caps-mask = <0x0000C000 0x0>;
12121212
sdhci-caps = <0x0 0x0>;
1213-
supports-cqe;
1213+
supports-cqe = <1>;
12141214
mmc-ddr-3_3v;
12151215
status = "disabled";
12161216
};

0 commit comments

Comments
 (0)