git.ipfire.org Git - thirdparty/openwrt.git/blob

   1 From 4a3a03d494e81b2a5d9a1ed77223677ddb19279c Mon Sep 17 00:00:00 2001
   2 From: Jonathan Bell <jonathan@raspberrypi.com>
   3 Date: Wed, 20 Mar 2024 15:14:53 +0000
   4 Subject: [PATCH 0985/1085] DTS: bcm2712: defer SDIO1 CQE selection to the
   5  board dtb
   6
   7 Command Queueing on Linux with SD cards is new, with the potential to cause
   8 filesystem corruption due to bugs in software or card firmware(s).
   9
  10 Default to disabled unless a) we know the interface connects to an eMMC
  11 device or b) we want it switched on.
  12
  13 Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  14 ---
  15  arch/arm/boot/dts/broadcom/bcm2712-rpi-5-b.dts  | 1 +
  16  arch/arm/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi | 1 +
  17  arch/arm/boot/dts/broadcom/bcm2712.dtsi         | 1 -
  18  arch/arm/boot/dts/overlays/README               | 4 ++++
  19  4 files changed, 6 insertions(+), 1 deletion(-)
  20
  21 --- a/arch/arm/boot/dts/broadcom/bcm2712-rpi-5-b.dts
  22 +++ b/arch/arm/boot/dts/broadcom/bcm2712-rpi-5-b.dts
  23 @@ -819,6 +819,7 @@ spi10_cs_pins: &spi10_cs_gpio1 {};
  24                 random = <&random>, "status";
  25                 rtc = <&rpi_rtc>, "status";
  26                 rtc_bbat_vchg = <&rpi_rtc>, "trickle-charge-microvolt:0";
  27 +               sd_cqe = <&sdio1>, "supports-cqe?";
  28                 spi = <&spi0>, "status";
  29                 suspend = <&pwr_key>, "linux,code:0=205";
  30                 uart0 = <&uart0>, "status";
  31 --- a/arch/arm/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
  32 +++ b/arch/arm/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
  33 @@ -355,6 +355,7 @@ dpi_16bit_gpio2:        &rp1_dpi_16bit_g
  34         mmc-hs200-1_8v;
  35         mmc-hs400-1_8v;
  36         broken-cd;
  37 +       supports-cqe;
  38         status = "okay";
  39  };
  40
  41 --- a/arch/arm/boot/dts/broadcom/bcm2712.dtsi
  42 +++ b/arch/arm/boot/dts/broadcom/bcm2712.dtsi
  43 @@ -1119,7 +1119,6 @@
  44                         clocks = <&clk_emmc2>;
  45                         sdhci-caps-mask = <0x0000C000 0x0>;
  46                         sdhci-caps = <0x0 0x0>;
  47 -                       supports-cqe;
  48                         mmc-ddr-3_3v;
  49                 };
  50
  51 --- a/arch/arm/boot/dts/overlays/README
  52 +++ b/arch/arm/boot/dts/overlays/README
  53 @@ -344,6 +344,10 @@ Params:
  54                                  non-lite SKU of CM4).
  55                                  (default "on")
  56
  57 +        sd_cqe                  Use to enable Command Queueing on the SD
  58 +                                interface for faster Class A2 card performance
  59 +                                (Pi 5 only, default "off")
  60 +
  61          sd_overclock            Clock (in MHz) to use when the MMC framework
  62                                  requests 50MHz
  63