sunxi: Enable DM_MMC for U-Boot proper

DM_MMC need MMC nodes in dtsi need to update and follow Linux notation to support dm driven mmc driver. So sync mmc nodes for sun4i-a10 from Linux. This will also useful for CLK driver handling in future.

Last linux commit for sun4i-a10.dtsi:
commit 590b0c0cfc6162aeebbf43eaafb9753b56df1532

Author: Pascal Roeleven <[email protected]>
Date:   Fri Apr 20 12:21:12 2018 +0200

ARM: dts: sun4i: Fix incorrect clocks for displays

Last linux commit for sun4i-a10-ccu.h:
commit 4328a2186e5120cfd34c4f04c6e4b7e74fb8b7b4

Author: Jonathan Liu <[email protected]>
Date:   Tue Oct 17 20:18:03 2017 +0800

clk: sunxi-ng: sun4i: Export video PLLs

Quoted 17 lines · Jagan Teki

DM_MMC need MMC nodes in dtsi need to update and follow Linux notation to support dm driven mmc driver. So sync mmc nodes for sun4i-a10 from Linux. This will also useful for CLK driver handling in future.

Last linux commit for sun4i-a10.dtsi:
commit 590b0c0cfc6162aeebbf43eaafb9753b56df1532

Author: Pascal Roeleven <[email protected]>
Date:   Fri Apr 20 12:21:12 2018 +0200

ARM: dts: sun4i: Fix incorrect clocks for displays

Last linux commit for sun4i-a10-ccu.h:
commit 4328a2186e5120cfd34c4f04c6e4b7e74fb8b7b4

Author: Jonathan Liu <[email protected]>
Date:   Tue Oct 17 20:18:03 2017 +0800

Quoted 1 line

clk: sunxi-ng: sun4i: Export video PLLs

Can't we just sync all the A10 DTs in one go to the latest kernel release, instead of half doing the work with a random commit?

Quoted 18 lines · Maxime Ripard

Quoted 17 lines · Jagan Teki

DM_MMC need MMC nodes in dtsi need to update and follow Linux notation to support dm driven mmc driver. So sync mmc nodes for sun4i-a10 from Linux. This will also useful for CLK driver handling in future.

Last linux commit for sun4i-a10.dtsi:
commit 590b0c0cfc6162aeebbf43eaafb9753b56df1532

Author: Pascal Roeleven <[email protected]>
Date:   Fri Apr 20 12:21:12 2018 +0200

ARM: dts: sun4i: Fix incorrect clocks for displays

Last linux commit for sun4i-a10-ccu.h:
commit 4328a2186e5120cfd34c4f04c6e4b7e74fb8b7b4

Author: Jonathan Liu <[email protected]>
Date:   Tue Oct 17 20:18:03 2017 +0800

Quoted 4 lines

Quoted 1 line

clk: sunxi-ng: sun4i: Export video PLLs

Can't we just sync all the A10 DTs in one go to the latest kernel release, instead of half doing the work with a random commit?

Now we need only minimal changes in dtsi, no need for board dts files to update for sun4i. All DT sync from Linux not require here at this point of time.

AHB reset0 is needed for Allwinner start from sun6i, so add driver data configuration for ahb reset0 and update the register bits during probe.

Cc Jaehoon Chung <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 drivers/mmc/sunxi_mmc.c | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

drivers/mmc/sunxi_mmc.c +17 -0

index 38171b81f3..beeded50af 100644
@@ -30,6 +30,7 @@ struct sunxi_mmc_priv {
 	unsigned fatal_err;
 	struct gpio_desc cd_gpio;	/* Change Detect GPIO */
 	int cd_inverted;		/* Inverted Card Detect */
+	u32 *reg_reset0;
 	struct sunxi_mmc *reg;
 	struct mmc_config cfg;
 };

@@ -528,6 +529,14 @@ struct mmc *sunxi_mmc_init(int sdc_no)
 }
 #else
 
+#define OFF_SUN6I_AHB_RESET0	0x2c0
+
+struct sunxi_mmc_config {
+	bool has_reset0;
+	u8 pos_reset0;
+	u32 off_reset0;
+};
+
 static int sunxi_mmc_set_ios(struct udevice *dev)
 {
 	struct sunxi_mmc_plat *plat = dev_get_platdata(dev);

@@ -569,6 +578,7 @@ static int sunxi_mmc_probe(struct udevice *dev)
 	struct sunxi_mmc_plat *plat = dev_get_platdata(dev);
 	struct sunxi_mmc_priv *priv = dev_get_priv(dev);
 	struct mmc_config *cfg = &plat->cfg;
+	const struct sunxi_mmc_config *data;
 	struct sunxi_ccm_reg *ccm;
 	struct ofnode_phandle_args args;
 	int bus_width, ret;

@@ -588,6 +598,7 @@ static int sunxi_mmc_probe(struct udevice *dev)
 	cfg->f_min = 400000;
 	cfg->f_max = 52000000;
 
+	data = (struct sunxi_mmc_config *)dev_get_driver_data(dev);
 	priv->reg = (void *)dev_read_addr(dev);
 	priv->mmc_no = (((uintptr_t)priv->reg / 0x1000) - 0x1C0F);
 

@@ -600,9 +611,15 @@ static int sunxi_mmc_probe(struct udevice *dev)
 	if (IS_ERR(ccm))
 		return PTR_ERR(ccm);
 
+	priv->reg_reset0 = (void *)ccm + data->off_reset0;
+
 	/* enable ahb gate */
 	setbits_le32(&ccm->ahb_gate0, BIT(AHB_GATE_OFFSET_MMC(priv->mmc_no)));
 
+	/* unassert reset */
+	if (data->has_reset0)
+		setbits_le32(priv->reg_reset0, BIT(data->pos_reset0 + priv->mmc_no));
+
 	/* find clock reg */
 	switch (priv->mmc_no) {
 	case 0:

@@ -653,10 +670,23 @@ static int sunxi_mmc_bind(struct udevice *dev)
 	return mmc_bind(dev, &plat->mmc, &plat->cfg);
 }

Quoted 73 lines · Jagan Teki

AHB reset0 is needed for Allwinner start from sun6i, so add driver data configuration for ahb reset0 and update the register bits during probe.

Cc Jaehoon Chung <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 drivers/mmc/sunxi_mmc.c | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

drivers/mmc/sunxi_mmc.c +17 -0

index 38171b81f3..beeded50af 100644
@@ -30,6 +30,7 @@ struct sunxi_mmc_priv {
      unsigned fatal_err;
      struct gpio_desc cd_gpio;       /* Change Detect GPIO */
      int cd_inverted;                /* Inverted Card Detect */
+     u32 *reg_reset0;
      struct sunxi_mmc *reg;
      struct mmc_config cfg;
 };

@@ -528,6 +529,14 @@ struct mmc *sunxi_mmc_init(int sdc_no)
 }
 #else
 
+#define OFF_SUN6I_AHB_RESET0 0x2c0
+
+struct sunxi_mmc_config {
+     bool has_reset0;
+     u8 pos_reset0;
+     u32 off_reset0;
+};
+
 static int sunxi_mmc_set_ios(struct udevice *dev)
 {
      struct sunxi_mmc_plat *plat = dev_get_platdata(dev);

@@ -569,6 +578,7 @@ static int sunxi_mmc_probe(struct udevice *dev)
      struct sunxi_mmc_plat *plat = dev_get_platdata(dev);
      struct sunxi_mmc_priv *priv = dev_get_priv(dev);
      struct mmc_config *cfg = &plat->cfg;
+     const struct sunxi_mmc_config *data;
      struct sunxi_ccm_reg *ccm;
      struct ofnode_phandle_args args;
      int bus_width, ret;

@@ -588,6 +598,7 @@ static int sunxi_mmc_probe(struct udevice *dev)
      cfg->f_min = 400000;
      cfg->f_max = 52000000;
 
+     data = (struct sunxi_mmc_config *)dev_get_driver_data(dev);
      priv->reg = (void *)dev_read_addr(dev);
      priv->mmc_no = (((uintptr_t)priv->reg / 0x1000) - 0x1C0F);
 

@@ -600,9 +611,15 @@ static int sunxi_mmc_probe(struct udevice *dev)
      if (IS_ERR(ccm))
              return PTR_ERR(ccm);
 
+     priv->reg_reset0 = (void *)ccm + data->off_reset0;
+
      /* enable ahb gate */
      setbits_le32(&ccm->ahb_gate0, BIT(AHB_GATE_OFFSET_MMC(priv->mmc_no)));
 
+     /* unassert reset */
+     if (data->has_reset0)
+             setbits_le32(priv->reg_reset0, BIT(data->pos_reset0 + priv->mmc_no));
+
      /* find clock reg */
      switch (priv->mmc_no) {
      case 0:

@@ -653,10 +670,23 @@ static int sunxi_mmc_bind(struct udevice *dev)
      return mmc_bind(dev, &plat->mmc, &plat->cfg);
 }
 

drivers/mmc/sunxi_mmc.c static int sunxi_mmc_bind(struct udevice *dev) · line 681

Quoted 9 lines

drivers/mmc/sunxi_mmc.c +9 -0

+static const struct sunxi_mmc_config sun4i_a10_cfg = {
+     .has_reset0 = false,
+};
+
+static const struct sunxi_mmc_config sun7i_a20_cfg = {
+     .has_reset0 = true,
+     .pos_reset0 = 8,
+     .off_reset0 = OFF_SUN6I_AHB_RESET0,
+};

Nope. The A20 doesn't have any reset line.

Quoted 74 lines · Maxime Ripard

Quoted 73 lines · Jagan Teki

AHB reset0 is needed for Allwinner start from sun6i, so add driver data configuration for ahb reset0 and update the register bits during probe.

Cc Jaehoon Chung <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 drivers/mmc/sunxi_mmc.c | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

drivers/mmc/sunxi_mmc.c +17 -0

index 38171b81f3..beeded50af 100644
@@ -30,6 +30,7 @@ struct sunxi_mmc_priv {
      unsigned fatal_err;
      struct gpio_desc cd_gpio;       /* Change Detect GPIO */
      int cd_inverted;                /* Inverted Card Detect */
+     u32 *reg_reset0;
      struct sunxi_mmc *reg;
      struct mmc_config cfg;
 };

@@ -528,6 +529,14 @@ struct mmc *sunxi_mmc_init(int sdc_no)
 }
 #else
 
+#define OFF_SUN6I_AHB_RESET0 0x2c0
+
+struct sunxi_mmc_config {
+     bool has_reset0;
+     u8 pos_reset0;
+     u32 off_reset0;
+};
+
 static int sunxi_mmc_set_ios(struct udevice *dev)
 {
      struct sunxi_mmc_plat *plat = dev_get_platdata(dev);

@@ -569,6 +578,7 @@ static int sunxi_mmc_probe(struct udevice *dev)
      struct sunxi_mmc_plat *plat = dev_get_platdata(dev);
      struct sunxi_mmc_priv *priv = dev_get_priv(dev);
      struct mmc_config *cfg = &plat->cfg;
+     const struct sunxi_mmc_config *data;
      struct sunxi_ccm_reg *ccm;
      struct ofnode_phandle_args args;
      int bus_width, ret;

@@ -588,6 +598,7 @@ static int sunxi_mmc_probe(struct udevice *dev)
      cfg->f_min = 400000;
      cfg->f_max = 52000000;
 
+     data = (struct sunxi_mmc_config *)dev_get_driver_data(dev);
      priv->reg = (void *)dev_read_addr(dev);
      priv->mmc_no = (((uintptr_t)priv->reg / 0x1000) - 0x1C0F);
 

@@ -600,9 +611,15 @@ static int sunxi_mmc_probe(struct udevice *dev)
      if (IS_ERR(ccm))
              return PTR_ERR(ccm);
 
+     priv->reg_reset0 = (void *)ccm + data->off_reset0;
+
      /* enable ahb gate */
      setbits_le32(&ccm->ahb_gate0, BIT(AHB_GATE_OFFSET_MMC(priv->mmc_no)));
 
+     /* unassert reset */
+     if (data->has_reset0)
+             setbits_le32(priv->reg_reset0, BIT(data->pos_reset0 + priv->mmc_no));
+
      /* find clock reg */
      switch (priv->mmc_no) {
      case 0:

@@ -653,10 +670,23 @@ static int sunxi_mmc_bind(struct udevice *dev)
      return mmc_bind(dev, &plat->mmc, &plat->cfg);
 }
 

Quoted 11 lines

drivers/mmc/sunxi_mmc.c static int sunxi_mmc_bind(struct udevice *dev) · line 681

Quoted 9 lines

drivers/mmc/sunxi_mmc.c +9 -0

+static const struct sunxi_mmc_config sun4i_a10_cfg = {
+     .has_reset0 = false,
+};
+
+static const struct sunxi_mmc_config sun7i_a20_cfg = {
+     .has_reset0 = true,
+     .pos_reset0 = 8,
+     .off_reset0 = OFF_SUN6I_AHB_RESET0,
+};

Nope. The A20 doesn't have any reset line.

Yes, I know. but sun6i-a31 has it and share same compatible allwinner,sun7i-a20-mmc ie reason I've attached driver data.

Quoted 88 lines · Jagan Teki

Quoted 85 lines · Maxime Ripard

Quoted 72 lines · Jagan Teki

AHB reset0 is needed for Allwinner start from sun6i, so add driver data configuration for ahb reset0 and update the register bits during probe.

Cc Jaehoon Chung <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 drivers/mmc/sunxi_mmc.c | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

drivers/mmc/sunxi_mmc.c +17 -0

index 38171b81f3..beeded50af 100644
@@ -30,6 +30,7 @@ struct sunxi_mmc_priv {
      unsigned fatal_err;
      struct gpio_desc cd_gpio;       /* Change Detect GPIO */
      int cd_inverted;                /* Inverted Card Detect */
+     u32 *reg_reset0;
      struct sunxi_mmc *reg;
      struct mmc_config cfg;
 };

@@ -528,6 +529,14 @@ struct mmc *sunxi_mmc_init(int sdc_no)
 }
 #else
 
+#define OFF_SUN6I_AHB_RESET0 0x2c0
+
+struct sunxi_mmc_config {
+     bool has_reset0;
+     u8 pos_reset0;
+     u32 off_reset0;
+};
+
 static int sunxi_mmc_set_ios(struct udevice *dev)
 {
      struct sunxi_mmc_plat *plat = dev_get_platdata(dev);

@@ -569,6 +578,7 @@ static int sunxi_mmc_probe(struct udevice *dev)
      struct sunxi_mmc_plat *plat = dev_get_platdata(dev);
      struct sunxi_mmc_priv *priv = dev_get_priv(dev);
      struct mmc_config *cfg = &plat->cfg;
+     const struct sunxi_mmc_config *data;
      struct sunxi_ccm_reg *ccm;
      struct ofnode_phandle_args args;
      int bus_width, ret;

@@ -588,6 +598,7 @@ static int sunxi_mmc_probe(struct udevice *dev)
      cfg->f_min = 400000;
      cfg->f_max = 52000000;
 
+     data = (struct sunxi_mmc_config *)dev_get_driver_data(dev);
      priv->reg = (void *)dev_read_addr(dev);
      priv->mmc_no = (((uintptr_t)priv->reg / 0x1000) - 0x1C0F);
 

@@ -600,9 +611,15 @@ static int sunxi_mmc_probe(struct udevice *dev)
      if (IS_ERR(ccm))
              return PTR_ERR(ccm);
 
+     priv->reg_reset0 = (void *)ccm + data->off_reset0;
+
      /* enable ahb gate */
      setbits_le32(&ccm->ahb_gate0, BIT(AHB_GATE_OFFSET_MMC(priv->mmc_no)));
 
+     /* unassert reset */
+     if (data->has_reset0)
+             setbits_le32(priv->reg_reset0, BIT(data->pos_reset0 + priv->mmc_no));
+
      /* find clock reg */
      switch (priv->mmc_no) {
      case 0:

@@ -653,10 +670,23 @@ static int sunxi_mmc_bind(struct udevice *dev)
      return mmc_bind(dev, &plat->mmc, &plat->cfg);
 }

drivers/mmc/sunxi_mmc.c static int sunxi_mmc_bind(struct udevice *dev) · line 681

Quoted 10 lines

drivers/mmc/sunxi_mmc.c +9 -0

 
+static const struct sunxi_mmc_config sun4i_a10_cfg = {
+     .has_reset0 = false,
+};
+
+static const struct sunxi_mmc_config sun7i_a20_cfg = {
+     .has_reset0 = true,
+     .pos_reset0 = 8,
+     .off_reset0 = OFF_SUN6I_AHB_RESET0,
+};

Nope. The A20 doesn't have any reset line.

Quoted 2 lines

Yes, I know. but sun6i-a31 has it and share same compatible allwinner,sun7i-a20-mmc ie reason I've attached driver data.

That doesn't make it more correct. The A20 doesn't have a reset line, I don't see any good reason to imply this.

Quoted 89 lines · Maxime Ripard

Quoted 88 lines · Jagan Teki

Quoted 85 lines · Maxime Ripard

Quoted 72 lines · Jagan Teki

AHB reset0 is needed for Allwinner start from sun6i, so add driver data configuration for ahb reset0 and update the register bits during probe.

Cc Jaehoon Chung <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 drivers/mmc/sunxi_mmc.c | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

drivers/mmc/sunxi_mmc.c +17 -0

index 38171b81f3..beeded50af 100644
@@ -30,6 +30,7 @@ struct sunxi_mmc_priv {
      unsigned fatal_err;
      struct gpio_desc cd_gpio;       /* Change Detect GPIO */
      int cd_inverted;                /* Inverted Card Detect */
+     u32 *reg_reset0;
      struct sunxi_mmc *reg;
      struct mmc_config cfg;
 };

@@ -528,6 +529,14 @@ struct mmc *sunxi_mmc_init(int sdc_no)
 }
 #else
 
+#define OFF_SUN6I_AHB_RESET0 0x2c0
+
+struct sunxi_mmc_config {
+     bool has_reset0;
+     u8 pos_reset0;
+     u32 off_reset0;
+};
+
 static int sunxi_mmc_set_ios(struct udevice *dev)
 {
      struct sunxi_mmc_plat *plat = dev_get_platdata(dev);

@@ -569,6 +578,7 @@ static int sunxi_mmc_probe(struct udevice *dev)
      struct sunxi_mmc_plat *plat = dev_get_platdata(dev);
      struct sunxi_mmc_priv *priv = dev_get_priv(dev);
      struct mmc_config *cfg = &plat->cfg;
+     const struct sunxi_mmc_config *data;
      struct sunxi_ccm_reg *ccm;
      struct ofnode_phandle_args args;
      int bus_width, ret;

@@ -588,6 +598,7 @@ static int sunxi_mmc_probe(struct udevice *dev)
      cfg->f_min = 400000;
      cfg->f_max = 52000000;
 
+     data = (struct sunxi_mmc_config *)dev_get_driver_data(dev);
      priv->reg = (void *)dev_read_addr(dev);
      priv->mmc_no = (((uintptr_t)priv->reg / 0x1000) - 0x1C0F);
 

@@ -600,9 +611,15 @@ static int sunxi_mmc_probe(struct udevice *dev)
      if (IS_ERR(ccm))
              return PTR_ERR(ccm);
 
+     priv->reg_reset0 = (void *)ccm + data->off_reset0;
+
      /* enable ahb gate */
      setbits_le32(&ccm->ahb_gate0, BIT(AHB_GATE_OFFSET_MMC(priv->mmc_no)));
 
+     /* unassert reset */
+     if (data->has_reset0)
+             setbits_le32(priv->reg_reset0, BIT(data->pos_reset0 + priv->mmc_no));
+
      /* find clock reg */
      switch (priv->mmc_no) {
      case 0:

@@ -653,10 +670,23 @@ static int sunxi_mmc_bind(struct udevice *dev)
      return mmc_bind(dev, &plat->mmc, &plat->cfg);
 }

drivers/mmc/sunxi_mmc.c static int sunxi_mmc_bind(struct udevice *dev) · line 681

Quoted 10 lines

drivers/mmc/sunxi_mmc.c +9 -0

 
+static const struct sunxi_mmc_config sun4i_a10_cfg = {
+     .has_reset0 = false,
+};
+
+static const struct sunxi_mmc_config sun7i_a20_cfg = {
+     .has_reset0 = true,
+     .pos_reset0 = 8,
+     .off_reset0 = OFF_SUN6I_AHB_RESET0,
+};

Nope. The A20 doesn't have any reset line.

Quoted 5 lines

Quoted 2 lines

Yes, I know. but sun6i-a31 has it and share same compatible allwinner,sun7i-a20-mmc ie reason I've attached driver data.

That doesn't make it more correct. The A20 doesn't have a reset line, I don't see any good reason to imply this.

OK, let me know if you have any suggestion on this I will remove this for A20.

Reuse mmc0 node from sun7i-a20.dtsi like other board dts files for Primo73 tablet dts file, and drop in dts mmc0 definition.

Cc Siarhei Siamashka <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 arch/arm/dts/sun7i-a20-primo73.dts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

arch/arm/dts/sun7i-a20-primo73.dts +0 -10

index 0658f82675..942a955309 100644
@@ -62,16 +62,6 @@
 	};
 
 	soc at 01c00000 {
-		mmc0: mmc at 01c0f000 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
-			vmmc-supply = <&reg_vcc3v3>;
-			bus-width = <4>;
-			cd-gpios = <&pio 7 1 0>; /* PH1 */
-			cd-inverted;
-			status = "okay";
-		};
-
 		usbphy: phy at 01c13400 {
 			usb2_vbus-supply = <&reg_usb2_vbus>;
 			status = "okay";

@@ -100,3 +90,13 @@
 		status = "okay";
 	};
 };

Quoted 39 lines · Jagan Teki

Reuse mmc0 node from sun7i-a20.dtsi like other board dts files for Primo73 tablet dts file, and drop in dts mmc0 definition.

Cc Siarhei Siamashka <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 arch/arm/dts/sun7i-a20-primo73.dts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

arch/arm/dts/sun7i-a20-primo73.dts +4 -10

index 0658f82675..942a955309 100644
@@ -62,16 +62,6 @@
      };
 
      soc at 01c00000 {
-             mmc0: mmc at 01c0f000 {
-                     pinctrl-names = "default";
-                     pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
-                     vmmc-supply = <&reg_vcc3v3>;
-                     bus-width = <4>;
-                     cd-gpios = <&pio 7 1 0>; /* PH1 */
-                     cd-inverted;
-                     status = "okay";
-             };
-
              usbphy: phy at 01c13400 {
                      usb2_vbus-supply = <&reg_usb2_vbus>;
                      status = "okay";

@@ -100,3 +90,13 @@
              status = "okay";
      };
 };
+
+&mmc0 {
+     pinctrl-names = "default";
+     pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;

arch/arm/dts/sun7i-a20-primo73.dts line 102

Quoted 6 lines

arch/arm/dts/sun7i-a20-primo73.dts +6 -0

+     vmmc-supply = <&reg_vcc3v3>;
+     bus-width = <4>;
+     cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
+     cd-inverted;
+     status = "okay";
+};

You're not adding the node, you're just moving it around.

Quoted 40 lines · Maxime Ripard

Quoted 39 lines · Jagan Teki

Reuse mmc0 node from sun7i-a20.dtsi like other board dts files for Primo73 tablet dts file, and drop in dts mmc0 definition.

Cc Siarhei Siamashka <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 arch/arm/dts/sun7i-a20-primo73.dts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

arch/arm/dts/sun7i-a20-primo73.dts +4 -10

index 0658f82675..942a955309 100644
@@ -62,16 +62,6 @@
      };
 
      soc at 01c00000 {
-             mmc0: mmc at 01c0f000 {
-                     pinctrl-names = "default";
-                     pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
-                     vmmc-supply = <&reg_vcc3v3>;
-                     bus-width = <4>;
-                     cd-gpios = <&pio 7 1 0>; /* PH1 */
-                     cd-inverted;
-                     status = "okay";
-             };
-
              usbphy: phy at 01c13400 {
                      usb2_vbus-supply = <&reg_usb2_vbus>;
                      status = "okay";

@@ -100,3 +90,13 @@
              status = "okay";
      };
 };
+
+&mmc0 {
+     pinctrl-names = "default";
+     pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;

Quoted 8 lines

arch/arm/dts/sun7i-a20-primo73.dts line 102

Quoted 6 lines

arch/arm/dts/sun7i-a20-primo73.dts +6 -0

+     vmmc-supply = <&reg_vcc3v3>;
+     bus-width = <4>;
+     cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
+     cd-inverted;
+     status = "okay";
+};

You're not adding the node, you're just moving it around.

ie what I mentioned on the commit message. adding mmc0 node like other board dts files and removing in dts mmc0 node definition.

Usually eMMC is default env fat device for environment, if MMC_SUNXI_SLOT_EXTRA != 1 Sunxi always probed emmc device as 1. but with DM_MMC it can be more possible to probe eMMC as device 2 since for most of the sunxi platforms eMMC is configured mmc2.

So update the fastboot mmc default device as 2 if DM_MMC and MMC_SUNXI_SLOT_EXTRA != 1 slot is 2 defined but some boards may not use all possible mmc devices or partly disabled in DT, for those update the device in board specific defconfig.

Cc Olliver Schinagl <[email protected]>

Cc Chen-Yu Tsai <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 +
 configs/Sinlinx_SinA33_defconfig           | 1 +
 configs/amarula_a64_relic_defconfig        | 1 +
 drivers/fastboot/Kconfig                   | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

configs/A20-OLinuXino-Lime2-eMMC_defconfig +1 -0

index 5657fc2594..20ea254191 100644
@@ -29,4 +29,5 @@ CONFIG_AXP_ALDO4_VOLT=2800
 CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

configs/Sinlinx_SinA33_defconfig +0 -0

index 394534b8b5..7841219a65 100644

configs/Sinlinx_SinA33_defconfig +0 -0

 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 CONFIG_USB_FUNCTION_MASS_STORAGE=y

configs/amarula_a64_relic_defconfig +1 -0

index b72cbfabc6..caeb3f6008 100644
@@ -12,4 +12,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-amarula-relic"
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

drivers/fastboot/Kconfig +0 -0

index bc25ea1d9c..4a1bfd119c 100644

Quoted 37 lines · Jagan Teki

Usually eMMC is default env fat device for environment, if MMC_SUNXI_SLOT_EXTRA != 1 Sunxi always probed emmc device as 1. but with DM_MMC it can be more possible to probe eMMC as device 2 since for most of the sunxi platforms eMMC is configured mmc2.

So update the fastboot mmc default device as 2 if DM_MMC and MMC_SUNXI_SLOT_EXTRA != 1 slot is 2 defined but some boards may not use all possible mmc devices or partly disabled in DT, for those update the device in board specific defconfig.

Cc Olliver Schinagl <[email protected]>

Cc Chen-Yu Tsai <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 +
 configs/Sinlinx_SinA33_defconfig           | 1 +
 configs/amarula_a64_relic_defconfig        | 1 +
 drivers/fastboot/Kconfig                   | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

configs/A20-OLinuXino-Lime2-eMMC_defconfig +1 -0

index 5657fc2594..20ea254191 100644
@@ -29,4 +29,5 @@ CONFIG_AXP_ALDO4_VOLT=2800
 CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

configs/Sinlinx_SinA33_defconfig +0 -0

index 394534b8b5..7841219a65 100644
@@ -21,5 +21,6 @@ CONFIG_DFU_RAM=y
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y

configs/Sinlinx_SinA33_defconfig CONFIG_DFU_RAM=y · line 24

Quoted 3 lines

configs/Sinlinx_SinA33_defconfig +1 -0

 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1

Your commit doesn't make any sense: the SinaA33 and the Lime2 both have the eMMC on MMC2, and you claim you want to update the default to point to MMC2, but you're changing both these boards to point to MMC1 instead?

Quoted 19 lines

configs/Sinlinx_SinA33_defconfig +0 -0

 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 CONFIG_USB_FUNCTION_MASS_STORAGE=y

configs/amarula_a64_relic_defconfig +1 -0

index b72cbfabc6..caeb3f6008 100644
@@ -12,4 +12,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-amarula-relic"
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

drivers/fastboot/Kconfig +0 -0

index bc25ea1d9c..4a1bfd119c 100644
@@ -88,7 +88,8 @@ config FASTBOOT_FLASH_MMC_DEV
      int "Define FASTBOOT MMC FLASH default device"

drivers/fastboot/Kconfig config FASTBOOT_FLASH_MMC_DEV · line 92

Quoted 5 lines

drivers/fastboot/Kconfig +2 -1

      depends on FASTBOOT_FLASH_MMC
      default 0 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1
-     default 1 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1
+     default 1 if ARCH_SUNXI && !DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1
+     default 2 if ARCH_SUNXI && DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1

It'd be better to be fixed properly, instead of just relying on a broken index.

Quoted 38 lines · Maxime Ripard

Quoted 37 lines · Jagan Teki

Usually eMMC is default env fat device for environment, if MMC_SUNXI_SLOT_EXTRA != 1 Sunxi always probed emmc device as 1. but with DM_MMC it can be more possible to probe eMMC as device 2 since for most of the sunxi platforms eMMC is configured mmc2.

So update the fastboot mmc default device as 2 if DM_MMC and MMC_SUNXI_SLOT_EXTRA != 1 slot is 2 defined but some boards may not use all possible mmc devices or partly disabled in DT, for those update the device in board specific defconfig.

Cc Olliver Schinagl <[email protected]>

Cc Chen-Yu Tsai <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 +
 configs/Sinlinx_SinA33_defconfig           | 1 +
 configs/amarula_a64_relic_defconfig        | 1 +
 drivers/fastboot/Kconfig                   | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

configs/A20-OLinuXino-Lime2-eMMC_defconfig +1 -0

index 5657fc2594..20ea254191 100644
@@ -29,4 +29,5 @@ CONFIG_AXP_ALDO4_VOLT=2800
 CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

configs/Sinlinx_SinA33_defconfig +0 -0

index 394534b8b5..7841219a65 100644
@@ -21,5 +21,6 @@ CONFIG_DFU_RAM=y
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y

Quoted 8 lines

configs/Sinlinx_SinA33_defconfig CONFIG_DFU_RAM=y · line 24

Quoted 3 lines

configs/Sinlinx_SinA33_defconfig +1 -0

 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1

Your commit doesn't make any sense: the SinaA33 and the Lime2 both have the eMMC on MMC2, and you claim you want to update the default to point to MMC2, but you're changing both these boards to point to MMC1 instead?

If DM_MMC and SLOT != 1 => default device 2 which is updated by kconfig, this is with all relevant mmc nodes are enabled
but these two boards mmc1 is not enabled so emmc will detected in device 1

Quoted 19 lines

Quoted 19 lines

configs/Sinlinx_SinA33_defconfig +0 -0

 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 CONFIG_USB_FUNCTION_MASS_STORAGE=y

configs/amarula_a64_relic_defconfig +1 -0

index b72cbfabc6..caeb3f6008 100644
@@ -12,4 +12,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-amarula-relic"
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

drivers/fastboot/Kconfig +0 -0

index bc25ea1d9c..4a1bfd119c 100644
@@ -88,7 +88,8 @@ config FASTBOOT_FLASH_MMC_DEV
      int "Define FASTBOOT MMC FLASH default device"

Quoted 8 lines

drivers/fastboot/Kconfig config FASTBOOT_FLASH_MMC_DEV · line 92

Quoted 5 lines

drivers/fastboot/Kconfig +2 -1

      depends on FASTBOOT_FLASH_MMC
      default 0 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1
-     default 1 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1
+     default 1 if ARCH_SUNXI && !DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1
+     default 2 if ARCH_SUNXI && DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1

It'd be better to be fixed properly, instead of just relying on a broken index.

I don't think we can't do anything with this now, since this INDEX more rely on SPL for pinctrl enablement. if you have any suggestion please share.

Quoted 82 lines · Jagan Teki

Quoted 38 lines · Maxime Ripard

Quoted 37 lines · Jagan Teki

Usually eMMC is default env fat device for environment, if MMC_SUNXI_SLOT_EXTRA != 1 Sunxi always probed emmc device as 1. but with DM_MMC it can be more possible to probe eMMC as device 2 since for most of the sunxi platforms eMMC is configured mmc2.

So update the fastboot mmc default device as 2 if DM_MMC and MMC_SUNXI_SLOT_EXTRA != 1 slot is 2 defined but some boards may not use all possible mmc devices or partly disabled in DT, for those update the device in board specific defconfig.

Cc Olliver Schinagl <[email protected]>

Cc Chen-Yu Tsai <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 +
 configs/Sinlinx_SinA33_defconfig           | 1 +
 configs/amarula_a64_relic_defconfig        | 1 +
 drivers/fastboot/Kconfig                   | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

configs/A20-OLinuXino-Lime2-eMMC_defconfig +1 -0

index 5657fc2594..20ea254191 100644
@@ -29,4 +29,5 @@ CONFIG_AXP_ALDO4_VOLT=2800
 CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

configs/Sinlinx_SinA33_defconfig +0 -0

index 394534b8b5..7841219a65 100644
@@ -21,5 +21,6 @@ CONFIG_DFU_RAM=y
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y

Quoted 8 lines

configs/Sinlinx_SinA33_defconfig CONFIG_DFU_RAM=y · line 24

Quoted 3 lines

configs/Sinlinx_SinA33_defconfig +1 -0

 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1

Your commit doesn't make any sense: the SinaA33 and the Lime2 both have the eMMC on MMC2, and you claim you want to update the default to point to MMC2, but you're changing both these boards to point to MMC1 instead?

If DM_MMC and SLOT != 1 => default device 2 which is updated by kconfig, this is with all relevant mmc nodes are enabled
but these two boards mmc1 is not enabled so emmc will detected in device 1

Quoted 19 lines

Quoted 19 lines

configs/Sinlinx_SinA33_defconfig +0 -0

 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 CONFIG_USB_FUNCTION_MASS_STORAGE=y

configs/amarula_a64_relic_defconfig +1 -0

index b72cbfabc6..caeb3f6008 100644
@@ -12,4 +12,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-amarula-relic"
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

drivers/fastboot/Kconfig +0 -0

index bc25ea1d9c..4a1bfd119c 100644
@@ -88,7 +88,8 @@ config FASTBOOT_FLASH_MMC_DEV
      int "Define FASTBOOT MMC FLASH default device"

Quoted 8 lines

drivers/fastboot/Kconfig config FASTBOOT_FLASH_MMC_DEV · line 92

Quoted 5 lines

drivers/fastboot/Kconfig +2 -1

      depends on FASTBOOT_FLASH_MMC
      default 0 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1
-     default 1 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1
+     default 1 if ARCH_SUNXI && !DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1
+     default 2 if ARCH_SUNXI && DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1

It'd be better to be fixed properly, instead of just relying on a broken index.

Quoted 3 lines

I don't think we can't do anything with this now, since this INDEX more rely on SPL for pinctrl enablement. if you have any suggestion please share.

Would another answer (at least for this specific case) to change the fastboot code so it doesn't need the device number in advance? Given we get device names along the lines of 'mmcsda1', we could parse out the 'a' to figure out the device number (and then use the alias code so your board can expose a portable name).

Quoted 87 lines · Alex Kiernan

Quoted 82 lines · Jagan Teki

Quoted 38 lines · Maxime Ripard

Quoted 37 lines · Jagan Teki

Usually eMMC is default env fat device for environment, if MMC_SUNXI_SLOT_EXTRA != 1 Sunxi always probed emmc device as 1. but with DM_MMC it can be more possible to probe eMMC as device 2 since for most of the sunxi platforms eMMC is configured mmc2.

So update the fastboot mmc default device as 2 if DM_MMC and MMC_SUNXI_SLOT_EXTRA != 1 slot is 2 defined but some boards may not use all possible mmc devices or partly disabled in DT, for those update the device in board specific defconfig.

Cc Olliver Schinagl <[email protected]>

Cc Chen-Yu Tsai <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 +
 configs/Sinlinx_SinA33_defconfig           | 1 +
 configs/amarula_a64_relic_defconfig        | 1 +
 drivers/fastboot/Kconfig                   | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

configs/A20-OLinuXino-Lime2-eMMC_defconfig +1 -0

index 5657fc2594..20ea254191 100644
@@ -29,4 +29,5 @@ CONFIG_AXP_ALDO4_VOLT=2800
 CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

configs/Sinlinx_SinA33_defconfig +0 -0

index 394534b8b5..7841219a65 100644
@@ -21,5 +21,6 @@ CONFIG_DFU_RAM=y
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y

Quoted 8 lines

configs/Sinlinx_SinA33_defconfig CONFIG_DFU_RAM=y · line 24

Quoted 3 lines

configs/Sinlinx_SinA33_defconfig +1 -0

 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1

Your commit doesn't make any sense: the SinaA33 and the Lime2 both have the eMMC on MMC2, and you claim you want to update the default to point to MMC2, but you're changing both these boards to point to MMC1 instead?

If DM_MMC and SLOT != 1 => default device 2 which is updated by kconfig, this is with all relevant mmc nodes are enabled
but these two boards mmc1 is not enabled so emmc will detected in device 1

Quoted 19 lines

Quoted 19 lines

configs/Sinlinx_SinA33_defconfig +0 -0

 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 CONFIG_USB_FUNCTION_MASS_STORAGE=y

configs/amarula_a64_relic_defconfig +1 -0

index b72cbfabc6..caeb3f6008 100644
@@ -12,4 +12,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-amarula-relic"
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

drivers/fastboot/Kconfig +0 -0

index bc25ea1d9c..4a1bfd119c 100644
@@ -88,7 +88,8 @@ config FASTBOOT_FLASH_MMC_DEV
      int "Define FASTBOOT MMC FLASH default device"

Quoted 8 lines

drivers/fastboot/Kconfig config FASTBOOT_FLASH_MMC_DEV · line 92

Quoted 5 lines

drivers/fastboot/Kconfig +2 -1

      depends on FASTBOOT_FLASH_MMC
      default 0 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1
-     default 1 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1
+     default 1 if ARCH_SUNXI && !DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1
+     default 2 if ARCH_SUNXI && DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1

It'd be better to be fixed properly, instead of just relying on a broken index.

Quoted 3 lines

I don't think we can't do anything with this now, since this INDEX more rely on SPL for pinctrl enablement. if you have any suggestion please share.

Quoted 5 lines

Would another answer (at least for this specific case) to change the fastboot code so it doesn't need the device number in advance? Given we get device names along the lines of 'mmcsda1', we could parse out the 'a' to figure out the device number (and then use the alias code so your board can expose a portable name).

That sounds like a pretty good solution. I guess we would have some corner cases when we have a NAND and an MMC card for example that can be flashed using fastboot, but I'm not sure we have boards in that setup at the moment (for Allwinner SoCs at least).

Quoted 95 lines · Maxime Ripard

Quoted 87 lines · Alex Kiernan

Quoted 82 lines · Jagan Teki

Quoted 38 lines · Maxime Ripard

Quoted 37 lines · Jagan Teki

Usually eMMC is default env fat device for environment, if MMC_SUNXI_SLOT_EXTRA != 1 Sunxi always probed emmc device as 1. but with DM_MMC it can be more possible to probe eMMC as device 2 since for most of the sunxi platforms eMMC is configured mmc2.

So update the fastboot mmc default device as 2 if DM_MMC and MMC_SUNXI_SLOT_EXTRA != 1 slot is 2 defined but some boards may not use all possible mmc devices or partly disabled in DT, for those update the device in board specific defconfig.

Cc Olliver Schinagl <[email protected]>

Cc Chen-Yu Tsai <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 +
 configs/Sinlinx_SinA33_defconfig           | 1 +
 configs/amarula_a64_relic_defconfig        | 1 +
 drivers/fastboot/Kconfig                   | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

configs/A20-OLinuXino-Lime2-eMMC_defconfig +1 -0

index 5657fc2594..20ea254191 100644
@@ -29,4 +29,5 @@ CONFIG_AXP_ALDO4_VOLT=2800
 CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

configs/Sinlinx_SinA33_defconfig +0 -0

index 394534b8b5..7841219a65 100644
@@ -21,5 +21,6 @@ CONFIG_DFU_RAM=y
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y

Quoted 8 lines

configs/Sinlinx_SinA33_defconfig CONFIG_DFU_RAM=y · line 24

Quoted 3 lines

configs/Sinlinx_SinA33_defconfig +1 -0

 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1

Your commit doesn't make any sense: the SinaA33 and the Lime2 both have the eMMC on MMC2, and you claim you want to update the default to point to MMC2, but you're changing both these boards to point to MMC1 instead?

If DM_MMC and SLOT != 1 => default device 2 which is updated by kconfig, this is with all relevant mmc nodes are enabled
but these two boards mmc1 is not enabled so emmc will detected in device 1

Quoted 19 lines

Quoted 19 lines

configs/Sinlinx_SinA33_defconfig +0 -0

 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 CONFIG_USB_FUNCTION_MASS_STORAGE=y

configs/amarula_a64_relic_defconfig +1 -0

index b72cbfabc6..caeb3f6008 100644
@@ -12,4 +12,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-amarula-relic"
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

drivers/fastboot/Kconfig +0 -0

index bc25ea1d9c..4a1bfd119c 100644
@@ -88,7 +88,8 @@ config FASTBOOT_FLASH_MMC_DEV
      int "Define FASTBOOT MMC FLASH default device"

Quoted 8 lines

drivers/fastboot/Kconfig config FASTBOOT_FLASH_MMC_DEV · line 92

Quoted 5 lines

drivers/fastboot/Kconfig +2 -1

      depends on FASTBOOT_FLASH_MMC
      default 0 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1
-     default 1 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1
+     default 1 if ARCH_SUNXI && !DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1
+     default 2 if ARCH_SUNXI && DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1

It'd be better to be fixed properly, instead of just relying on a broken index.

Quoted 3 lines

I don't think we can't do anything with this now, since this INDEX more rely on SPL for pinctrl enablement. if you have any suggestion please share.

Quoted 5 lines

Would another answer (at least for this specific case) to change the fastboot code so it doesn't need the device number in advance? Given we get device names along the lines of 'mmcsda1', we could parse out the 'a' to figure out the device number (and then use the alias code so your board can expose a portable name).

Quoted 5 lines

That sounds like a pretty good solution. I guess we would have some corner cases when we have a NAND and an MMC card for example that can be flashed using fastboot, but I'm not sure we have boards in that setup at the moment (for Allwinner SoCs at least).

It's not something I need right now, but having spent so much time refactoring the fastboot code I'd like to get to this! Support for getvar all is also on my todo list.

The NAND stuff is a good call, I'm not sure how that fits in (not least not having a board which has a NAND part).

Quoted 107 lines · Alex Kiernan

Quoted 95 lines · Maxime Ripard

Quoted 87 lines · Alex Kiernan

Quoted 82 lines · Jagan Teki

Quoted 38 lines · Maxime Ripard

Quoted 37 lines · Jagan Teki

Usually eMMC is default env fat device for environment, if MMC_SUNXI_SLOT_EXTRA != 1 Sunxi always probed emmc device as 1. but with DM_MMC it can be more possible to probe eMMC as device 2 since for most of the sunxi platforms eMMC is configured mmc2.

So update the fastboot mmc default device as 2 if DM_MMC and MMC_SUNXI_SLOT_EXTRA != 1 slot is 2 defined but some boards may not use all possible mmc devices or partly disabled in DT, for those update the device in board specific defconfig.

Cc Olliver Schinagl <[email protected]>

Cc Chen-Yu Tsai <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 +
 configs/Sinlinx_SinA33_defconfig           | 1 +
 configs/amarula_a64_relic_defconfig        | 1 +
 drivers/fastboot/Kconfig                   | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

configs/A20-OLinuXino-Lime2-eMMC_defconfig +1 -0

index 5657fc2594..20ea254191 100644
@@ -29,4 +29,5 @@ CONFIG_AXP_ALDO4_VOLT=2800
 CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

configs/Sinlinx_SinA33_defconfig +0 -0

index 394534b8b5..7841219a65 100644
@@ -21,5 +21,6 @@ CONFIG_DFU_RAM=y
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y

Quoted 8 lines

configs/Sinlinx_SinA33_defconfig CONFIG_DFU_RAM=y · line 24

Quoted 3 lines

configs/Sinlinx_SinA33_defconfig +1 -0

 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1

Your commit doesn't make any sense: the SinaA33 and the Lime2 both have the eMMC on MMC2, and you claim you want to update the default to point to MMC2, but you're changing both these boards to point to MMC1 instead?

If DM_MMC and SLOT != 1 => default device 2 which is updated by kconfig, this is with all relevant mmc nodes are enabled
but these two boards mmc1 is not enabled so emmc will detected in device 1

Quoted 19 lines

Quoted 19 lines

configs/Sinlinx_SinA33_defconfig +0 -0

 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 CONFIG_USB_FUNCTION_MASS_STORAGE=y

configs/amarula_a64_relic_defconfig +1 -0

index b72cbfabc6..caeb3f6008 100644
@@ -12,4 +12,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-amarula-relic"
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

drivers/fastboot/Kconfig +0 -0

index bc25ea1d9c..4a1bfd119c 100644
@@ -88,7 +88,8 @@ config FASTBOOT_FLASH_MMC_DEV
      int "Define FASTBOOT MMC FLASH default device"

Quoted 8 lines

drivers/fastboot/Kconfig config FASTBOOT_FLASH_MMC_DEV · line 92

Quoted 5 lines

drivers/fastboot/Kconfig +2 -1

      depends on FASTBOOT_FLASH_MMC
      default 0 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1
-     default 1 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1
+     default 1 if ARCH_SUNXI && !DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1
+     default 2 if ARCH_SUNXI && DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1

It'd be better to be fixed properly, instead of just relying on a broken index.

Quoted 3 lines

I don't think we can't do anything with this now, since this INDEX more rely on SPL for pinctrl enablement. if you have any suggestion please share.

Quoted 5 lines

Would another answer (at least for this specific case) to change the fastboot code so it doesn't need the device number in advance? Given we get device names along the lines of 'mmcsda1', we could parse out the 'a' to figure out the device number (and then use the alias code so your board can expose a portable name).

Quoted 5 lines

That sounds like a pretty good solution. I guess we would have some corner cases when we have a NAND and an MMC card for example that can be flashed using fastboot, but I'm not sure we have boards in that setup at the moment (for Allwinner SoCs at least).

It's not something I need right now, but having spent so much time refactoring the fastboot code I'd like to get to this! Support for getvar all is also on my todo list.

Quoted 2 lines

The NAND stuff is a good call, I'm not sure how that fits in (not least not having a board which has a NAND part).

Maybe we can hack something at the partition level though: instead of having the partition name itself, what about prefixing it by the device name? ie having something like mmc1:rootfs and nand0:rootfs, as partition name.

Quoted 111 lines · Maxime Ripard

Quoted 109 lines · Alex Kiernan

Quoted 95 lines · Maxime Ripard

Quoted 87 lines · Alex Kiernan

Quoted 82 lines · Jagan Teki

Quoted 38 lines · Maxime Ripard

Quoted 37 lines · Jagan Teki

Usually eMMC is default env fat device for environment, if MMC_SUNXI_SLOT_EXTRA != 1 Sunxi always probed emmc device as 1. but with DM_MMC it can be more possible to probe eMMC as device 2 since for most of the sunxi platforms eMMC is configured mmc2.

So update the fastboot mmc default device as 2 if DM_MMC and MMC_SUNXI_SLOT_EXTRA != 1 slot is 2 defined but some boards may not use all possible mmc devices or partly disabled in DT, for those update the device in board specific defconfig.

Cc Olliver Schinagl <[email protected]>

Cc Chen-Yu Tsai <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 +
 configs/Sinlinx_SinA33_defconfig           | 1 +
 configs/amarula_a64_relic_defconfig        | 1 +
 drivers/fastboot/Kconfig                   | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

configs/A20-OLinuXino-Lime2-eMMC_defconfig +1 -0

index 5657fc2594..20ea254191 100644
@@ -29,4 +29,5 @@ CONFIG_AXP_ALDO4_VOLT=2800
 CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

configs/Sinlinx_SinA33_defconfig +0 -0

index 394534b8b5..7841219a65 100644
@@ -21,5 +21,6 @@ CONFIG_DFU_RAM=y
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y

Quoted 8 lines

configs/Sinlinx_SinA33_defconfig CONFIG_DFU_RAM=y · line 24

Quoted 3 lines

configs/Sinlinx_SinA33_defconfig +1 -0

 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1

Your commit doesn't make any sense: the SinaA33 and the Lime2 both have the eMMC on MMC2, and you claim you want to update the default to point to MMC2, but you're changing both these boards to point to MMC1 instead?

If DM_MMC and SLOT != 1 => default device 2 which is updated by kconfig, this is with all relevant mmc nodes are enabled
but these two boards mmc1 is not enabled so emmc will detected in device 1

Quoted 19 lines

Quoted 19 lines

configs/Sinlinx_SinA33_defconfig +0 -0

 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 CONFIG_USB_FUNCTION_MASS_STORAGE=y

configs/amarula_a64_relic_defconfig +1 -0

index b72cbfabc6..caeb3f6008 100644
@@ -12,4 +12,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-amarula-relic"
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

drivers/fastboot/Kconfig +0 -0

index bc25ea1d9c..4a1bfd119c 100644
@@ -88,7 +88,8 @@ config FASTBOOT_FLASH_MMC_DEV
      int "Define FASTBOOT MMC FLASH default device"

Quoted 8 lines

drivers/fastboot/Kconfig config FASTBOOT_FLASH_MMC_DEV · line 92

Quoted 5 lines

drivers/fastboot/Kconfig +2 -1

      depends on FASTBOOT_FLASH_MMC
      default 0 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1
-     default 1 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1
+     default 1 if ARCH_SUNXI && !DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1
+     default 2 if ARCH_SUNXI && DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1

It'd be better to be fixed properly, instead of just relying on a broken index.

Quoted 3 lines

I don't think we can't do anything with this now, since this INDEX more rely on SPL for pinctrl enablement. if you have any suggestion please share.

Quoted 5 lines

Would another answer (at least for this specific case) to change the fastboot code so it doesn't need the device number in advance? Given we get device names along the lines of 'mmcsda1', we could parse out the 'a' to figure out the device number (and then use the alias code so your board can expose a portable name).

Quoted 5 lines

That sounds like a pretty good solution. I guess we would have some corner cases when we have a NAND and an MMC card for example that can be flashed using fastboot, but I'm not sure we have boards in that setup at the moment (for Allwinner SoCs at least).

It's not something I need right now, but having spent so much time refactoring the fastboot code I'd like to get to this! Support for getvar all is also on my todo list.

The NAND stuff is a good call, I'm not sure how that fits in (not least not having a board which has a NAND part).

Quoted 4 lines

Maybe we can hack something at the partition level though: instead of having the partition name itself, what about prefixing it by the device name? ie having something like mmc1:rootfs and nand0:rootfs, as partition name.

How about giving an input during command 'fastboot <controller> [dev_type] <dev[:part]>' it can be fastboot 0 mmc 1 similar like ums did 'ums 0 mmc 1'

Quoted 107 lines · Alex Kiernan

Quoted 95 lines · Maxime Ripard

Quoted 87 lines · Alex Kiernan

Quoted 82 lines · Jagan Teki

Quoted 38 lines · Maxime Ripard

Quoted 37 lines · Jagan Teki

Usually eMMC is default env fat device for environment, if MMC_SUNXI_SLOT_EXTRA != 1 Sunxi always probed emmc device as 1. but with DM_MMC it can be more possible to probe eMMC as device 2 since for most of the sunxi platforms eMMC is configured mmc2.

So update the fastboot mmc default device as 2 if DM_MMC and MMC_SUNXI_SLOT_EXTRA != 1 slot is 2 defined but some boards may not use all possible mmc devices or partly disabled in DT, for those update the device in board specific defconfig.

Cc Olliver Schinagl <[email protected]>

Cc Chen-Yu Tsai <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 +
 configs/Sinlinx_SinA33_defconfig           | 1 +
 configs/amarula_a64_relic_defconfig        | 1 +
 drivers/fastboot/Kconfig                   | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

configs/A20-OLinuXino-Lime2-eMMC_defconfig +1 -0

index 5657fc2594..20ea254191 100644
@@ -29,4 +29,5 @@ CONFIG_AXP_ALDO4_VOLT=2800
 CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

configs/Sinlinx_SinA33_defconfig +0 -0

index 394534b8b5..7841219a65 100644
@@ -21,5 +21,6 @@ CONFIG_DFU_RAM=y
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y

Quoted 8 lines

configs/Sinlinx_SinA33_defconfig CONFIG_DFU_RAM=y · line 24

Quoted 3 lines

configs/Sinlinx_SinA33_defconfig +1 -0

 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1

Your commit doesn't make any sense: the SinaA33 and the Lime2 both have the eMMC on MMC2, and you claim you want to update the default to point to MMC2, but you're changing both these boards to point to MMC1 instead?

If DM_MMC and SLOT != 1 => default device 2 which is updated by kconfig, this is with all relevant mmc nodes are enabled
but these two boards mmc1 is not enabled so emmc will detected in device 1

Quoted 19 lines

Quoted 19 lines

configs/Sinlinx_SinA33_defconfig +0 -0

 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 CONFIG_USB_FUNCTION_MASS_STORAGE=y

configs/amarula_a64_relic_defconfig +1 -0

index b72cbfabc6..caeb3f6008 100644
@@ -12,4 +12,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-amarula-relic"
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

drivers/fastboot/Kconfig +0 -0

index bc25ea1d9c..4a1bfd119c 100644
@@ -88,7 +88,8 @@ config FASTBOOT_FLASH_MMC_DEV
      int "Define FASTBOOT MMC FLASH default device"

Quoted 8 lines

drivers/fastboot/Kconfig config FASTBOOT_FLASH_MMC_DEV · line 92

Quoted 5 lines

drivers/fastboot/Kconfig +2 -1

      depends on FASTBOOT_FLASH_MMC
      default 0 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1
-     default 1 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1
+     default 1 if ARCH_SUNXI && !DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1
+     default 2 if ARCH_SUNXI && DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1

It'd be better to be fixed properly, instead of just relying on a broken index.

Quoted 3 lines

I don't think we can't do anything with this now, since this INDEX more rely on SPL for pinctrl enablement. if you have any suggestion please share.

Quoted 5 lines

Would another answer (at least for this specific case) to change the fastboot code so it doesn't need the device number in advance? Given we get device names along the lines of 'mmcsda1', we could parse out the 'a' to figure out the device number (and then use the alias code so your board can expose a portable name).

Quoted 5 lines

That sounds like a pretty good solution. I guess we would have some corner cases when we have a NAND and an MMC card for example that can be flashed using fastboot, but I'm not sure we have boards in that setup at the moment (for Allwinner SoCs at least).

It's not something I need right now, but having spent so much time refactoring the fastboot code I'd like to get to this! Support for getvar all is also on my todo list.

Quoted 2 lines

The NAND stuff is a good call, I'm not sure how that fits in (not least not having a board which has a NAND part).

Maybe we can hack something at the partition level though: instead of having the partition name itself, what about prefixing it by the device name? ie having something like mmc1:rootfs and nand0:rootfs, as partition name.

Quoted 109 lines · Maxime Ripard

Quoted 107 lines · Alex Kiernan

Quoted 95 lines · Maxime Ripard

Quoted 87 lines · Alex Kiernan

Quoted 82 lines · Jagan Teki

Quoted 38 lines · Maxime Ripard

Quoted 37 lines · Jagan Teki

Usually eMMC is default env fat device for environment, if MMC_SUNXI_SLOT_EXTRA != 1 Sunxi always probed emmc device as 1. but with DM_MMC it can be more possible to probe eMMC as device 2 since for most of the sunxi platforms eMMC is configured mmc2.

So update the fastboot mmc default device as 2 if DM_MMC and MMC_SUNXI_SLOT_EXTRA != 1 slot is 2 defined but some boards may not use all possible mmc devices or partly disabled in DT, for those update the device in board specific defconfig.

Cc Olliver Schinagl <[email protected]>

Cc Chen-Yu Tsai <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 +
 configs/Sinlinx_SinA33_defconfig           | 1 +
 configs/amarula_a64_relic_defconfig        | 1 +
 drivers/fastboot/Kconfig                   | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

configs/A20-OLinuXino-Lime2-eMMC_defconfig +1 -0

index 5657fc2594..20ea254191 100644
@@ -29,4 +29,5 @@ CONFIG_AXP_ALDO4_VOLT=2800
 CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

configs/Sinlinx_SinA33_defconfig +0 -0

index 394534b8b5..7841219a65 100644
@@ -21,5 +21,6 @@ CONFIG_DFU_RAM=y
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y

Quoted 8 lines

configs/Sinlinx_SinA33_defconfig CONFIG_DFU_RAM=y · line 24

Quoted 3 lines

configs/Sinlinx_SinA33_defconfig +1 -0

 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1

Your commit doesn't make any sense: the SinaA33 and the Lime2 both have the eMMC on MMC2, and you claim you want to update the default to point to MMC2, but you're changing both these boards to point to MMC1 instead?

If DM_MMC and SLOT != 1 => default device 2 which is updated by kconfig, this is with all relevant mmc nodes are enabled
but these two boards mmc1 is not enabled so emmc will detected in device 1

Quoted 19 lines

Quoted 19 lines

configs/Sinlinx_SinA33_defconfig +0 -0

 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 CONFIG_USB_FUNCTION_MASS_STORAGE=y

configs/amarula_a64_relic_defconfig +1 -0

index b72cbfabc6..caeb3f6008 100644
@@ -12,4 +12,5 @@ CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-amarula-relic"
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

drivers/fastboot/Kconfig +0 -0

index bc25ea1d9c..4a1bfd119c 100644
@@ -88,7 +88,8 @@ config FASTBOOT_FLASH_MMC_DEV
      int "Define FASTBOOT MMC FLASH default device"

Quoted 8 lines

drivers/fastboot/Kconfig config FASTBOOT_FLASH_MMC_DEV · line 92

Quoted 5 lines

drivers/fastboot/Kconfig +2 -1

      depends on FASTBOOT_FLASH_MMC
      default 0 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA = -1
-     default 1 if ARCH_SUNXI && MMC_SUNXI_SLOT_EXTRA != -1
+     default 1 if ARCH_SUNXI && !DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1
+     default 2 if ARCH_SUNXI && DM_MMC && MMC_SUNXI_SLOT_EXTRA != -1

It'd be better to be fixed properly, instead of just relying on a broken index.

Quoted 3 lines

I don't think we can't do anything with this now, since this INDEX more rely on SPL for pinctrl enablement. if you have any suggestion please share.

Quoted 5 lines

Would another answer (at least for this specific case) to change the fastboot code so it doesn't need the device number in advance? Given we get device names along the lines of 'mmcsda1', we could parse out the 'a' to figure out the device number (and then use the alias code so your board can expose a portable name).

Quoted 5 lines

That sounds like a pretty good solution. I guess we would have some corner cases when we have a NAND and an MMC card for example that can be flashed using fastboot, but I'm not sure we have boards in that setup at the moment (for Allwinner SoCs at least).

It's not something I need right now, but having spent so much time refactoring the fastboot code I'd like to get to this! Support for getvar all is also on my todo list.

Quoted 8 lines

Quoted 2 lines

The NAND stuff is a good call, I'm not sure how that fits in (not least not having a board which has a NAND part).

Maybe we can hack something at the partition level though: instead of having the partition name itself, what about prefixing it by the device name? ie having something like mmc1:rootfs and nand0:rootfs, as partition name.

Just looking at the code, I suspect NAND already works, just use the name that mtd knows. And mmc looks trivial to implement.

I guess one question is if you want to be able to filter out which devices you can address from the fastboot client.

Quoted 38 lines · Maxime Ripard

Quoted 37 lines · Jagan Teki

Usually eMMC is default env fat device for environment, if MMC_SUNXI_SLOT_EXTRA != 1 Sunxi always probed emmc device as 1. but with DM_MMC it can be more possible to probe eMMC as device 2 since for most of the sunxi platforms eMMC is configured mmc2.

So update the fastboot mmc default device as 2 if DM_MMC and MMC_SUNXI_SLOT_EXTRA != 1 slot is 2 defined but some boards may not use all possible mmc devices or partly disabled in DT, for those update the device in board specific defconfig.

Cc Olliver Schinagl <[email protected]>

Cc Chen-Yu Tsai <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 configs/A20-OLinuXino-Lime2-eMMC_defconfig | 1 +
 configs/Sinlinx_SinA33_defconfig           | 1 +
 configs/amarula_a64_relic_defconfig        | 1 +
 drivers/fastboot/Kconfig                   | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

configs/A20-OLinuXino-Lime2-eMMC_defconfig +1 -0

index 5657fc2594..20ea254191 100644
@@ -29,4 +29,5 @@ CONFIG_AXP_ALDO4_VOLT=2800
 CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

configs/Sinlinx_SinA33_defconfig +0 -0

index 394534b8b5..7841219a65 100644
@@ -21,5 +21,6 @@ CONFIG_DFU_RAM=y
 CONFIG_FASTBOOT_CMD_OEM_FORMAT=y

Quoted 8 lines

configs/Sinlinx_SinA33_defconfig CONFIG_DFU_RAM=y · line 24

Quoted 3 lines

configs/Sinlinx_SinA33_defconfig +1 -0

 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1

Your commit doesn't make any sense: the SinaA33 and the Lime2 both have the eMMC on MMC2, and you claim you want to update the default to point to MMC2, but you're changing both these boards to point to MMC1 instead?

If DM_MMC and SLOT != 1 => default device 2 which is updated by kconfig, this is with all relevant mmc nodes are enabled but these two boards mmc1 is not enabled so emmc will detected in device 1

Usually eMMC is default env fat device for environment, if MMC_SUNXI_SLOT_EXTRA != 1 Sunxi always probed emmc device as 1. but with DM_MMC it can be more possible to probe eMMC as device 2 since for most of the sunxi platforms eMMC is configured mmc2.

So update the env default device as 2 if DM_MMC and MMC_SUNXI_SLOT_EXTRA != 1 but some boards may not use all possible mmc devices or partly disabled in DT, for those update the device in board specific defconfig.

Cc Olliver Schinagl <[email protected]>

Cc Hans de Goede <[email protected]>

Cc Marcus Cooper <[email protected]>

Cc Stefan Mavrodiev <[email protected]>

Cc Paul Kocialkowski <[email protected]>

Cc Chen-Yu Tsai <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 configs/A20-OLinuXino-Lime2-eMMC_defconfig   | 1 +
 configs/A20-OLinuXino_MICRO-eMMC_defconfig   | 1 +
 configs/A20-OLinuXino_MICRO_defconfig        | 1 +
 configs/A20-Olimex-SOM-EVB_defconfig         | 1 +
 configs/A20-Olimex-SOM204-EVB-eMMC_defconfig | 1 +
 configs/Mele_M3_defconfig                    | 1 +
 configs/Orangepi_mini_defconfig              | 1 +
 configs/Sinlinx_SinA33_defconfig             | 1 +
 configs/Yones_Toptech_BD1078_defconfig       | 1 +
 configs/amarula_a64_relic_defconfig          | 1 +
 env/Kconfig                                  | 3 ++-
 11 files changed, 12 insertions(+), 1 deletion(-)

configs/A20-OLinuXino-Lime2-eMMC_defconfig +1 -0

index 20ea254191..98a8ceb178 100644
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB0_VBUS_PIN="PC17"
 CONFIG_USB0_VBUS_DET="PH5"
 CONFIG_I2C1_ENABLE=y

configs/A20-OLinuXino_MICRO-eMMC_defconfig +1 -0

index f7e7cbab0a..1552960d88 100644
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_I2C1_ENABLE=y
 CONFIG_VIDEO_VGA=y
 CONFIG_SATAPWR="PB8"

configs/A20-OLinuXino_MICRO_defconfig +1 -0

index 8dcbdc08f9..b5f1b7efe2 100644
@@ -6,6 +6,7 @@ CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC3_CD_PIN="PH11"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=3
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_I2C1_ENABLE=y
 CONFIG_VIDEO_VGA=y
 CONFIG_SATAPWR="PB8"

configs/A20-Olimex-SOM-EVB_defconfig +1 -0

index a06499e2d0..58f6fbad91 100644
@@ -7,6 +7,7 @@ CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC3_CD_PIN="PH0"
 CONFIG_MMC3_PINS="PH"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=3
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB0_VBUS_PIN="PB9"
 CONFIG_USB0_VBUS_DET="PH5"
 CONFIG_SATAPWR="PC3"

configs/A20-Olimex-SOM204-EVB-eMMC_defconfig +1 -0

index 3bb8c4c7e6..ac4f841c4e 100644
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB0_VBUS_PIN="PC17"
 CONFIG_USB0_VBUS_DET="PH5"
 CONFIG_I2C1_ENABLE=y

configs/Mele_M3_defconfig +1 -0

index 9f48bd91e0..93a2395aee 100644
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_VIDEO_VGA=y
 CONFIG_VIDEO_COMPOSITE=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m3"

configs/Orangepi_mini_defconfig +1 -0

index 46f27be254..d562273bef 100644
@@ -7,6 +7,7 @@ CONFIG_MACPWR="PH23"
 CONFIG_MMC0_CD_PIN="PH10"
 CONFIG_MMC3_CD_PIN="PH11"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=3
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB1_VBUS_PIN="PH26"
 CONFIG_USB2_VBUS_PIN="PH22"
 CONFIG_VIDEO_COMPOSITE=y

configs/Sinlinx_SinA33_defconfig +1 -0

index 7841219a65..061f27c9db 100644
@@ -6,6 +6,7 @@ CONFIG_DRAM_CLK=552
 CONFIG_DRAM_ZQ=15291
 CONFIG_MMC0_CD_PIN="PB4"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB0_ID_DET="PH8"
 CONFIG_VIDEO_LCD_MODE="x:1024,y:600,depth:18,pclk_khz:66000,le:90,ri:160,up:3,lo:127,hs:70,vs:20,sync:3,vmode:0"
 CONFIG_VIDEO_LCD_DCLK_PHASE=0

configs/Yones_Toptech_BD1078_defconfig +0 -0

index c49cbcbc3c..cad5618d54 100644

Quoted 132 lines · Jagan Teki

Usually eMMC is default env fat device for environment, if MMC_SUNXI_SLOT_EXTRA != 1 Sunxi always probed emmc device as 1. but with DM_MMC it can be more possible to probe eMMC as device 2 since for most of the sunxi platforms eMMC is configured mmc2.

So update the env default device as 2 if DM_MMC and MMC_SUNXI_SLOT_EXTRA != 1 but some boards may not use all possible mmc devices or partly disabled in DT, for those update the device in board specific defconfig.

Cc Olliver Schinagl <[email protected]>

Cc Hans de Goede <[email protected]>

Cc Marcus Cooper <[email protected]>

Cc Stefan Mavrodiev <[email protected]>

Cc Paul Kocialkowski <[email protected]>

Cc Chen-Yu Tsai <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 configs/A20-OLinuXino-Lime2-eMMC_defconfig   | 1 +
 configs/A20-OLinuXino_MICRO-eMMC_defconfig   | 1 +
 configs/A20-OLinuXino_MICRO_defconfig        | 1 +
 configs/A20-Olimex-SOM-EVB_defconfig         | 1 +
 configs/A20-Olimex-SOM204-EVB-eMMC_defconfig | 1 +
 configs/Mele_M3_defconfig                    | 1 +
 configs/Orangepi_mini_defconfig              | 1 +
 configs/Sinlinx_SinA33_defconfig             | 1 +
 configs/Yones_Toptech_BD1078_defconfig       | 1 +
 configs/amarula_a64_relic_defconfig          | 1 +
 env/Kconfig                                  | 3 ++-
 11 files changed, 12 insertions(+), 1 deletion(-)

configs/A20-OLinuXino-Lime2-eMMC_defconfig +1 -0

index 20ea254191..98a8ceb178 100644
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB0_VBUS_PIN="PC17"
 CONFIG_USB0_VBUS_DET="PH5"
 CONFIG_I2C1_ENABLE=y

configs/A20-OLinuXino_MICRO-eMMC_defconfig +1 -0

index f7e7cbab0a..1552960d88 100644
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_I2C1_ENABLE=y
 CONFIG_VIDEO_VGA=y
 CONFIG_SATAPWR="PB8"

configs/A20-OLinuXino_MICRO_defconfig +1 -0

index 8dcbdc08f9..b5f1b7efe2 100644
@@ -6,6 +6,7 @@ CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC3_CD_PIN="PH11"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=3
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_I2C1_ENABLE=y
 CONFIG_VIDEO_VGA=y
 CONFIG_SATAPWR="PB8"

configs/A20-Olimex-SOM-EVB_defconfig +1 -0

index a06499e2d0..58f6fbad91 100644
@@ -7,6 +7,7 @@ CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC3_CD_PIN="PH0"
 CONFIG_MMC3_PINS="PH"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=3
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB0_VBUS_PIN="PB9"
 CONFIG_USB0_VBUS_DET="PH5"
 CONFIG_SATAPWR="PC3"

configs/A20-Olimex-SOM204-EVB-eMMC_defconfig +1 -0

index 3bb8c4c7e6..ac4f841c4e 100644
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB0_VBUS_PIN="PC17"
 CONFIG_USB0_VBUS_DET="PH5"
 CONFIG_I2C1_ENABLE=y

configs/Mele_M3_defconfig +1 -0

index 9f48bd91e0..93a2395aee 100644
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_VIDEO_VGA=y
 CONFIG_VIDEO_COMPOSITE=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m3"

configs/Orangepi_mini_defconfig +1 -0

index 46f27be254..d562273bef 100644
@@ -7,6 +7,7 @@ CONFIG_MACPWR="PH23"
 CONFIG_MMC0_CD_PIN="PH10"
 CONFIG_MMC3_CD_PIN="PH11"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=3
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB1_VBUS_PIN="PH26"
 CONFIG_USB2_VBUS_PIN="PH22"
 CONFIG_VIDEO_COMPOSITE=y

configs/Sinlinx_SinA33_defconfig +1 -0

index 7841219a65..061f27c9db 100644
@@ -6,6 +6,7 @@ CONFIG_DRAM_CLK=552
 CONFIG_DRAM_ZQ=15291
 CONFIG_MMC0_CD_PIN="PB4"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB0_ID_DET="PH8"
 CONFIG_VIDEO_LCD_MODE="x:1024,y:600,depth:18,pclk_khz:66000,le:90,ri:160,up:3,lo:127,hs:70,vs:20,sync:3,vmode:0"
 CONFIG_VIDEO_LCD_DCLK_PHASE=0

configs/Yones_Toptech_BD1078_defconfig +0 -0

index c49cbcbc3c..cad5618d54 100644

configs/Yones_Toptech_BD1078_defconfig CONFIG_MMC0_CD_PIN="PH1" · line 10

Quoted 5 lines

configs/Yones_Toptech_BD1078_defconfig +1 -0

@@ -7,6 +7,7 @@ CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC1_CD_PIN="PH2"
 CONFIG_MMC1_PINS="PH"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=1
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"

Again, you're breaking all these boards while saying you want to fix them.

Quoted 133 lines · Maxime Ripard

Quoted 132 lines · Jagan Teki

Usually eMMC is default env fat device for environment, if MMC_SUNXI_SLOT_EXTRA != 1 Sunxi always probed emmc device as 1. but with DM_MMC it can be more possible to probe eMMC as device 2 since for most of the sunxi platforms eMMC is configured mmc2.

So update the env default device as 2 if DM_MMC and MMC_SUNXI_SLOT_EXTRA != 1 but some boards may not use all possible mmc devices or partly disabled in DT, for those update the device in board specific defconfig.

Cc Olliver Schinagl <[email protected]>

Cc Hans de Goede <[email protected]>

Cc Marcus Cooper <[email protected]>

Cc Stefan Mavrodiev <[email protected]>

Cc Paul Kocialkowski <[email protected]>

Cc Chen-Yu Tsai <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 configs/A20-OLinuXino-Lime2-eMMC_defconfig   | 1 +
 configs/A20-OLinuXino_MICRO-eMMC_defconfig   | 1 +
 configs/A20-OLinuXino_MICRO_defconfig        | 1 +
 configs/A20-Olimex-SOM-EVB_defconfig         | 1 +
 configs/A20-Olimex-SOM204-EVB-eMMC_defconfig | 1 +
 configs/Mele_M3_defconfig                    | 1 +
 configs/Orangepi_mini_defconfig              | 1 +
 configs/Sinlinx_SinA33_defconfig             | 1 +
 configs/Yones_Toptech_BD1078_defconfig       | 1 +
 configs/amarula_a64_relic_defconfig          | 1 +
 env/Kconfig                                  | 3 ++-
 11 files changed, 12 insertions(+), 1 deletion(-)

configs/A20-OLinuXino-Lime2-eMMC_defconfig +1 -0

index 20ea254191..98a8ceb178 100644
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB0_VBUS_PIN="PC17"
 CONFIG_USB0_VBUS_DET="PH5"
 CONFIG_I2C1_ENABLE=y

configs/A20-OLinuXino_MICRO-eMMC_defconfig +1 -0

index f7e7cbab0a..1552960d88 100644
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_I2C1_ENABLE=y
 CONFIG_VIDEO_VGA=y
 CONFIG_SATAPWR="PB8"

configs/A20-OLinuXino_MICRO_defconfig +1 -0

index 8dcbdc08f9..b5f1b7efe2 100644
@@ -6,6 +6,7 @@ CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC3_CD_PIN="PH11"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=3
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_I2C1_ENABLE=y
 CONFIG_VIDEO_VGA=y
 CONFIG_SATAPWR="PB8"

configs/A20-Olimex-SOM-EVB_defconfig +1 -0

index a06499e2d0..58f6fbad91 100644
@@ -7,6 +7,7 @@ CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC3_CD_PIN="PH0"
 CONFIG_MMC3_PINS="PH"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=3
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB0_VBUS_PIN="PB9"
 CONFIG_USB0_VBUS_DET="PH5"
 CONFIG_SATAPWR="PC3"

configs/A20-Olimex-SOM204-EVB-eMMC_defconfig +1 -0

index 3bb8c4c7e6..ac4f841c4e 100644
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB0_VBUS_PIN="PC17"
 CONFIG_USB0_VBUS_DET="PH5"
 CONFIG_I2C1_ENABLE=y

configs/Mele_M3_defconfig +1 -0

index 9f48bd91e0..93a2395aee 100644
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_VIDEO_VGA=y
 CONFIG_VIDEO_COMPOSITE=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m3"

configs/Orangepi_mini_defconfig +1 -0

index 46f27be254..d562273bef 100644
@@ -7,6 +7,7 @@ CONFIG_MACPWR="PH23"
 CONFIG_MMC0_CD_PIN="PH10"
 CONFIG_MMC3_CD_PIN="PH11"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=3
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB1_VBUS_PIN="PH26"
 CONFIG_USB2_VBUS_PIN="PH22"
 CONFIG_VIDEO_COMPOSITE=y

configs/Sinlinx_SinA33_defconfig +1 -0

index 7841219a65..061f27c9db 100644
@@ -6,6 +6,7 @@ CONFIG_DRAM_CLK=552
 CONFIG_DRAM_ZQ=15291
 CONFIG_MMC0_CD_PIN="PB4"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB0_ID_DET="PH8"
 CONFIG_VIDEO_LCD_MODE="x:1024,y:600,depth:18,pclk_khz:66000,le:90,ri:160,up:3,lo:127,hs:70,vs:20,sync:3,vmode:0"
 CONFIG_VIDEO_LCD_DCLK_PHASE=0

configs/Yones_Toptech_BD1078_defconfig +0 -0

index c49cbcbc3c..cad5618d54 100644

Quoted 8 lines

configs/Yones_Toptech_BD1078_defconfig CONFIG_MMC0_CD_PIN="PH1" · line 10

Quoted 5 lines

configs/Yones_Toptech_BD1078_defconfig +1 -0

@@ -7,6 +7,7 @@ CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC1_CD_PIN="PH2"
 CONFIG_MMC1_PINS="PH"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=1
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"

Again, you're breaking all these boards while saying you want to fix them.

Let me know what is breaking here, I'm trying to update the env device like before even if the order or detection follow as per DT.

Quoted 144 lines · Jagan Teki

Quoted 133 lines · Maxime Ripard

Quoted 132 lines · Jagan Teki

Usually eMMC is default env fat device for environment, if MMC_SUNXI_SLOT_EXTRA != 1 Sunxi always probed emmc device as 1. but with DM_MMC it can be more possible to probe eMMC as device 2 since for most of the sunxi platforms eMMC is configured mmc2.

So update the env default device as 2 if DM_MMC and MMC_SUNXI_SLOT_EXTRA != 1 but some boards may not use all possible mmc devices or partly disabled in DT, for those update the device in board specific defconfig.

Cc Olliver Schinagl <[email protected]>

Cc Hans de Goede <[email protected]>

Cc Marcus Cooper <[email protected]>

Cc Stefan Mavrodiev <[email protected]>

Cc Paul Kocialkowski <[email protected]>

Cc Chen-Yu Tsai <[email protected]>

Signed-off-by Jagan Teki <[email protected]>

---
 configs/A20-OLinuXino-Lime2-eMMC_defconfig   | 1 +
 configs/A20-OLinuXino_MICRO-eMMC_defconfig   | 1 +
 configs/A20-OLinuXino_MICRO_defconfig        | 1 +
 configs/A20-Olimex-SOM-EVB_defconfig         | 1 +
 configs/A20-Olimex-SOM204-EVB-eMMC_defconfig | 1 +
 configs/Mele_M3_defconfig                    | 1 +
 configs/Orangepi_mini_defconfig              | 1 +
 configs/Sinlinx_SinA33_defconfig             | 1 +
 configs/Yones_Toptech_BD1078_defconfig       | 1 +
 configs/amarula_a64_relic_defconfig          | 1 +
 env/Kconfig                                  | 3 ++-
 11 files changed, 12 insertions(+), 1 deletion(-)

configs/A20-OLinuXino-Lime2-eMMC_defconfig +1 -0

index 20ea254191..98a8ceb178 100644
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB0_VBUS_PIN="PC17"
 CONFIG_USB0_VBUS_DET="PH5"
 CONFIG_I2C1_ENABLE=y

configs/A20-OLinuXino_MICRO-eMMC_defconfig +1 -0

index f7e7cbab0a..1552960d88 100644
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_I2C1_ENABLE=y
 CONFIG_VIDEO_VGA=y
 CONFIG_SATAPWR="PB8"

configs/A20-OLinuXino_MICRO_defconfig +1 -0

index 8dcbdc08f9..b5f1b7efe2 100644
@@ -6,6 +6,7 @@ CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC3_CD_PIN="PH11"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=3
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_I2C1_ENABLE=y
 CONFIG_VIDEO_VGA=y
 CONFIG_SATAPWR="PB8"

configs/A20-Olimex-SOM-EVB_defconfig +1 -0

index a06499e2d0..58f6fbad91 100644
@@ -7,6 +7,7 @@ CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC3_CD_PIN="PH0"
 CONFIG_MMC3_PINS="PH"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=3
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB0_VBUS_PIN="PB9"
 CONFIG_USB0_VBUS_DET="PH5"
 CONFIG_SATAPWR="PC3"

configs/A20-Olimex-SOM204-EVB-eMMC_defconfig +1 -0

index 3bb8c4c7e6..ac4f841c4e 100644
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB0_VBUS_PIN="PC17"
 CONFIG_USB0_VBUS_DET="PH5"
 CONFIG_I2C1_ENABLE=y

configs/Mele_M3_defconfig +1 -0

index 9f48bd91e0..93a2395aee 100644
@@ -5,6 +5,7 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=384
 CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_VIDEO_VGA=y
 CONFIG_VIDEO_COMPOSITE=y
 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-m3"

configs/Orangepi_mini_defconfig +1 -0

index 46f27be254..d562273bef 100644
@@ -7,6 +7,7 @@ CONFIG_MACPWR="PH23"
 CONFIG_MMC0_CD_PIN="PH10"
 CONFIG_MMC3_CD_PIN="PH11"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=3
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB1_VBUS_PIN="PH26"
 CONFIG_USB2_VBUS_PIN="PH22"
 CONFIG_VIDEO_COMPOSITE=y

configs/Sinlinx_SinA33_defconfig +1 -0

index 7841219a65..061f27c9db 100644
@@ -6,6 +6,7 @@ CONFIG_DRAM_CLK=552
 CONFIG_DRAM_ZQ=15291
 CONFIG_MMC0_CD_PIN="PB4"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"
 CONFIG_USB0_ID_DET="PH8"
 CONFIG_VIDEO_LCD_MODE="x:1024,y:600,depth:18,pclk_khz:66000,le:90,ri:160,up:3,lo:127,hs:70,vs:20,sync:3,vmode:0"
 CONFIG_VIDEO_LCD_DCLK_PHASE=0

configs/Yones_Toptech_BD1078_defconfig +0 -0

index c49cbcbc3c..cad5618d54 100644

Quoted 8 lines

configs/Yones_Toptech_BD1078_defconfig CONFIG_MMC0_CD_PIN="PH1" · line 10

Quoted 5 lines

configs/Yones_Toptech_BD1078_defconfig +1 -0

@@ -7,6 +7,7 @@ CONFIG_MMC0_CD_PIN="PH1"
 CONFIG_MMC1_CD_PIN="PH2"
 CONFIG_MMC1_PINS="PH"
 CONFIG_MMC_SUNXI_SLOT_EXTRA=1
+CONFIG_ENV_FAT_DEVICE_AND_PART="1:auto"

Again, you're breaking all these boards while saying you want to fix them.

Quoted 2 lines

Let me know what is breaking here, I'm trying to update the env device like before even if the order or detection follow as per DT.

If the number is the one coming from the DT, then with DM_MMC, the ID will change for them as well and they will have the FAT device become 2 if they have an eMMC. Which is why you're changing the default.

However, you're also changing the defconfig so that the number remain the same, so you'll end up with the previous id being used, 1, which is not the eMMC one.

A proper fix would be to simply changing the default.

With DM_MMC the mmc devices are probed as per dt status and eMMC can probed maximum device of 2, if all nodes like mmc0, mmc1 and mmc2 status are 'okay'.

So update mmc_bootdev to 2 and add boot order as 2, 1, 0 devices. so-that it can to boot any identified device even if the respective device status disabled or unsupported.

Signed-off-by Jagan Teki <[email protected]>

---
 board/sunxi/board.c            | 2 +-
 include/configs/sunxi-common.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

board/sunxi/board.c +0 -0

index 5ed1b8bae1..7edc468185 100644

Quoted 14 lines · Jagan Teki

With DM_MMC the mmc devices are probed as per dt status and eMMC can probed maximum device of 2, if all nodes like mmc0, mmc1 and mmc2 status are 'okay'.

So update mmc_bootdev to 2 and add boot order as 2, 1, 0 devices. so-that it can to boot any identified device even if the respective device status disabled or unsupported.

Signed-off-by Jagan Teki <[email protected]>

---
 board/sunxi/board.c            | 2 +-
 include/configs/sunxi-common.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

board/sunxi/board.c int misc_init_r(void) · line 771

Quoted 10 lines

board/sunxi/board.c +1 -1

index 5ed1b8bae1..7edc468185 100644
@@ -768,7 +768,7 @@ int misc_init_r(void)
      } else if (boot == BOOT_DEVICE_MMC1) {
              env_set("mmc_bootdev", "0");
      } else if (boot == BOOT_DEVICE_MMC2) {
-             env_set("mmc_bootdev", "1");
+             env_set("mmc_bootdev", "2");

Isn't that broken too? I guess we should return MMC3 in that case.

Also, what about bisectability?

Quoted 15 lines · Maxime Ripard

Quoted 14 lines · Jagan Teki

With DM_MMC the mmc devices are probed as per dt status and eMMC can probed maximum device of 2, if all nodes like mmc0, mmc1 and mmc2 status are 'okay'.

So update mmc_bootdev to 2 and add boot order as 2, 1, 0 devices. so-that it can to boot any identified device even if the respective device status disabled or unsupported.

Signed-off-by Jagan Teki <[email protected]>

---
 board/sunxi/board.c            | 2 +-
 include/configs/sunxi-common.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

Quoted 12 lines

board/sunxi/board.c int misc_init_r(void) · line 771

Quoted 10 lines

board/sunxi/board.c +1 -1

index 5ed1b8bae1..7edc468185 100644
@@ -768,7 +768,7 @@ int misc_init_r(void)
      } else if (boot == BOOT_DEVICE_MMC1) {
              env_set("mmc_bootdev", "0");
      } else if (boot == BOOT_DEVICE_MMC2) {
-             env_set("mmc_bootdev", "1");
+             env_set("mmc_bootdev", "2");

Isn't that broken too? I guess we should return MMC3 in that case.

Yes, A10 has maximum of mmc3 will fix.

Quoted 2 lines

Also, what about bisectability?

are you referring order check while booting, ie reason I've update the ordering with device 2, 1, 0