Skip to contentSkip to conversation

arm:mmc:goni/exynos: Fix wrong mmc base register devices offset.

PATCH New Przemyslaw Marczak 3 participants 8 messages Sep 3, 2013 – Sep 11, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm:mmc:goni/exynos: Fix wrong mmc base register devices offset.

On s5pc1xx mmc devices offset is multiply of 0x100000, wrong value was 0x10000. Register offset always points to mmc 0 before this change.

Add macro definition of mmc dev register offset to s5pc1xx and exynos mmc.

---
 arch/arm/include/asm/arch-exynos/mmc.h  |    6 +++++-
 arch/arm/include/asm/arch-s5pc1xx/mmc.h |    6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)
arch/arm/include/asm/arch-exynos/mmc.h +5 -1
index 96610b8..98312d1 100644
@@ -8,6 +8,8 @@
 #ifndef __ASM_ARCH_MMC_H_
 #define __ASM_ARCH_MMC_H_
 
+#define S5P_MMC_DEV_OFFSET	0x10000
+
 #define SDHCI_CONTROL2		0x80
 #define SDHCI_CONTROL3		0x84
 #define SDHCI_CONTROL4		0x8C
@@ -55,7 +57,9 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width);
 
 static inline unsigned int s5p_mmc_init(int index, int bus_width)
 {
-	unsigned int base = samsung_get_base_mmc() + (0x10000 * index);
+	unsigned int base = samsung_get_base_mmc() +
+				(S5P_MMC_DEV_OFFSET * index);
+
 	return s5p_sdhci_init(base, index, bus_width);
 }
 #endif
arch/arm/include/asm/arch-s5pc1xx/mmc.h +5 -1
index 96610b8..55ff10b 100644
@@ -8,6 +8,8 @@
 #ifndef __ASM_ARCH_MMC_H_
 #define __ASM_ARCH_MMC_H_
 
+#define S5P_MMC_DEV_OFFSET	0x100000
+
 #define SDHCI_CONTROL2		0x80
 #define SDHCI_CONTROL3		0x84
 #define SDHCI_CONTROL4		0x8C
@@ -55,7 +57,9 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width);
 
 static inline unsigned int s5p_mmc_init(int index, int bus_width)
 {
-	unsigned int base = samsung_get_base_mmc() + (0x10000 * index);
+	unsigned int base = samsung_get_base_mmc() +
+				 (S5P_MMC_DEV_OFFSET * index);
+
 	return s5p_sdhci_init(base, index, bus_width);
 }
 #endif
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 ums: Add "dev num" parameter. Check mmc device before do ums init.

This change allows using every mmc device instance with ums, like eMMC or SD cards. Now MMC device is checked before ums is inited.

Example of use: ums <device_number> for mmc devices.

---
 board/samsung/trats/trats.c   |   12 +++---------
 common/cmd_usb_mass_storage.c |   30 ++++++++++++++----------------
 include/usb_mass_storage.h    |    4 ++--
 3 files changed, 19 insertions(+), 27 deletions(-)
board/samsung/trats/trats.c +3 -9
index 7f61d17..b7f7b05 100644
@@ -816,17 +816,11 @@ static struct ums_board_info ums_board = {
 	},
 };
 
-struct ums_board_info *board_ums_init(unsigned int dev_num, unsigned int offset,
-				      unsigned int part_size)
+struct ums_board_info *board_ums_init(struct mmc *mmc, unsigned int offset,
+					unsigned int part_size)
 {
-	struct mmc *mmc;
-
-	mmc = find_mmc_device(dev_num);
-	if (!mmc)
-		return NULL;
-
 	ums_board.ums_dev.mmc = mmc;
-	ums_board.ums_dev.dev_num = dev_num;
+	ums_board.ums_dev.dev_num = mmc->block_dev.dev;
 	ums_board.ums_dev.offset = offset;
 	ums_board.ums_dev.part_size = part_size;
 
common/cmd_usb_mass_storage.c +14 -16
index 33a4715..62c1308 100644
@@ -14,6 +14,7 @@
 int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
 			       int argc, char * const argv[])
 {
+	struct mmc *mmc = NULL;
 	char *ep;
 	unsigned int dev_num = 0, offset = 0, part_size = 0;
 	int rc;
@@ -21,29 +22,29 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
 	struct ums_board_info *ums_info;
 	static char *s = "ums";
 
-	if (argc < 2) {
-		printf("usage: ums <dev> - e.g. ums 0\n");
-		return 0;
-	}
+	if (argc < 2)
+		return CMD_RET_USAGE;
 
 	dev_num = (int)simple_strtoul(argv[1], &ep, 16);
 
-	if (dev_num) {
-		puts("\nSet eMMC device to 0! - e.g. ums 0\n");
-		goto fail;
+	mmc = find_mmc_device(dev_num);
+	if (!mmc) {
+		printf("UMS error: invalid mmc device num: %d.\n", dev_num);
+		return CMD_RET_FAILURE;
 	}
 
 	board_usb_init();
-	ums_info = board_ums_init(dev_num, offset, part_size);
 
+	ums_info = board_ums_init(mmc, offset, part_size);
 	if (!ums_info) {
-		printf("MMC: %d -> NOT available\n", dev_num);
-		goto fail;
+		printf("UMS is not supported on this board.\n");
+		return CMD_RET_FAILURE;
 	}
+
 	rc = fsg_init(ums_info);
 	if (rc) {
 		printf("cmd ums: fsg_init failed\n");
-		goto fail;
+		return CMD_RET_FAILURE;
 	}
 
 	g_dnl_register(s);
@@ -61,13 +62,10 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
 	}
 exit:
 	g_dnl_unregister();
-	return 0;
-
-fail:
-	return -1;
+	return CMD_RET_SUCCESS;
 }
 
 U_BOOT_CMD(ums, CONFIG_SYS_MAXARGS, 1, do_usb_mass_storage,
 	"Use the UMS [User Mass Storage]",
-	"ums - User Mass Storage Gadget"
+	"ums <dev> e.g. ums 0"
 );
include/usb_mass_storage.h +2 -2
index 35cdcc3..0f94f31 100644
@@ -34,8 +34,8 @@ extern void board_usb_init(void);
 
 extern int fsg_init(struct ums_board_info *);
 extern void fsg_cleanup(void);
-extern struct ums_board_info *board_ums_init(unsigned int,
-					     unsigned int, unsigned int);
+extern struct ums_board_info *board_ums_init(struct mmc *, unsigned int,
+						unsigned int);
 extern int usb_gadget_handle_interrupts(void);
 extern int fsg_main_thread(void *);
 
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 1/1 ums: Add "dev num" parameter. Check mmc device before do ums init.

Dear Przemyslaw Marczak,

Quoted 26 lines

This change allows using every mmc device instance with ums, like eMMC or SD cards. Now MMC device is checked before ums is inited.

Example of use: ums <device_number> for mmc devices.

---
 board/samsung/trats/trats.c   |   12 +++---------
 common/cmd_usb_mass_storage.c |   30 ++++++++++++++----------------
 include/usb_mass_storage.h    |    4 ++--
 3 files changed, 19 insertions(+), 27 deletions(-)
board/samsung/trats/trats.c +1 -1
index 7f61d17..b7f7b05 100644
@@ -816,17 +816,11 @@ static struct ums_board_info ums_board = {
 	},
 };
 
-struct ums_board_info *board_ums_init(unsigned int dev_num, unsigned int
 offset, -				      unsigned int part_size)
+struct ums_board_info *board_ums_init(struct mmc *mmc, unsigned int
 offset, +					unsigned int part_size)

board/samsung/trats/trats.c static struct ums_board_info ums_board = { · line 824

Quoted 10 lines
board/samsung/trats/trats.c +1 -7
 {
-	struct mmc *mmc;
-
-	mmc = find_mmc_device(dev_num);
-	if (!mmc)
-		return NULL;
-
 	ums_board.ums_dev.mmc = mmc;
-	ums_board.ums_dev.dev_num = dev_num;
+	ums_board.ums_dev.dev_num = mmc->block_dev.dev;

You already pass "mmc", why pass mmc->block_dev.dev too? Is it not a little redundant?

Quoted 16 lines
board/samsung/trats/trats.c +0 -0
 	ums_board.ums_dev.offset = offset;
 	ums_board.ums_dev.part_size = part_size;
common/cmd_usb_mass_storage.c +1 -0
index 33a4715..62c1308 100644
@@ -14,6 +14,7 @@
 int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
 			       int argc, char * const argv[])
 {
+	struct mmc *mmc = NULL;
 	char *ep;
 	unsigned int dev_num = 0, offset = 0, part_size = 0;
 	int rc;

common/cmd_usb_mass_storage.c int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, · line 26

Quoted 9 lines
common/cmd_usb_mass_storage.c +2 -4
@@ -21,29 +22,29 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
 	struct ums_board_info *ums_info;
 	static char *s = "ums";
 
-	if (argc < 2) {
-		printf("usage: ums <dev> - e.g. ums 0\n");
-		return 0;
-	}
+	if (argc < 2)
+		return CMD_RET_USAGE;

UMS works on MMC devices only right now?

Quoted 9 lines
common/cmd_usb_mass_storage.c +4 -3
 	dev_num = (int)simple_strtoul(argv[1], &ep, 16);
 
-	if (dev_num) {
-		puts("\nSet eMMC device to 0! - e.g. ums 0\n");
-		goto fail;
+	mmc = find_mmc_device(dev_num);
+	if (!mmc) {
+		printf("UMS error: invalid mmc device num: %d.\n", dev_num);
+		return CMD_RET_FAILURE;

common/cmd_usb_mass_storage.c int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, · line 40

Quoted 10 lines
common/cmd_usb_mass_storage.c +2 -3
 	}
 
 	board_usb_init();
-	ums_info = board_ums_init(dev_num, offset, part_size);
 
+	ums_info = board_ums_init(mmc, offset, part_size);
 	if (!ums_info) {
-		printf("MMC: %d -> NOT available\n", dev_num);
-		goto fail;
+		printf("UMS is not supported on this board.\n");

puts()

Quoted 32 lines
common/cmd_usb_mass_storage.c +5 -6
+		return CMD_RET_FAILURE;
 	}
+
 	rc = fsg_init(ums_info);
 	if (rc) {
 		printf("cmd ums: fsg_init failed\n");
-		goto fail;
+		return CMD_RET_FAILURE;
 	}
 
 	g_dnl_register(s);
@@ -61,13 +62,10 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
 	}
 exit:
 	g_dnl_unregister();
-	return 0;
-
-fail:
-	return -1;
+	return CMD_RET_SUCCESS;
 }
 
 U_BOOT_CMD(ums, CONFIG_SYS_MAXARGS, 1, do_usb_mass_storage,
 	"Use the UMS [User Mass Storage]",
-	"ums - User Mass Storage Gadget"
+	"ums <dev> e.g. ums 0"
 );
include/usb_mass_storage.h +0 -0
index 35cdcc3..0f94f31 100644

include/usb_mass_storage.h extern void board_usb_init(void); · line 40

Quoted 9 lines
include/usb_mass_storage.h +2 -2
@@ -34,8 +34,8 @@ extern void board_usb_init(void);
 
 extern int fsg_init(struct ums_board_info *);
 extern void fsg_cleanup(void);
-extern struct ums_board_info *board_ums_init(unsigned int,
-					     unsigned int, unsigned int);
+extern struct ums_board_info *board_ums_init(struct mmc *, unsigned int,
+						unsigned int);
 extern int usb_gadget_handle_interrupts(void);
 extern int fsg_main_thread(void *);

Best regards,
Marek Vasut

#3 lore raw

PATCH 1/1 ums: Add "dev num" parameter. Check mmc device before do ums init.

Hello Marek,
Thank you for reply.

Quoted 33 lines · Marek Vasut

Dear Przemyslaw Marczak,

Quoted 31 lines

This change allows using every mmc device instance with ums, like eMMC or SD cards. Now MMC device is checked before ums is inited.

Example of use: ums <device_number> for mmc devices.

---
  board/samsung/trats/trats.c   |   12 +++---------
  common/cmd_usb_mass_storage.c |   30 ++++++++++++++----------------
  include/usb_mass_storage.h    |    4 ++--
  3 files changed, 19 insertions(+), 27 deletions(-)
board/samsung/trats/trats.c +1 -5
index 7f61d17..b7f7b05 100644
@@ -816,17 +816,11 @@ static struct ums_board_info ums_board = {
  	},
  };
 
-struct ums_board_info *board_ums_init(unsigned int dev_num, unsigned int
 offset, -				      unsigned int part_size)
+struct ums_board_info *board_ums_init(struct mmc *mmc, unsigned int
 offset, +					unsigned int part_size)
  {
-	struct mmc *mmc;
-
-	mmc = find_mmc_device(dev_num);
-	if (!mmc)
Quoted 9 lines

board/samsung/trats/trats.c static struct ums_board_info ums_board = { · line 823

Quoted 5 lines
board/samsung/trats/trats.c +1 -3
-		return NULL;
-
  	ums_board.ums_dev.mmc = mmc;
-	ums_board.ums_dev.dev_num = dev_num;
+	ums_board.ums_dev.dev_num = mmc->block_dev.dev;

You already pass "mmc", why pass mmc->block_dev.dev too? Is it not a little redundant?

You are right, it is little redundant but pointer to this structure is returned so we expect that structure fields were proper filled, right?

Quoted 19 lines
Quoted 19 lines
board/samsung/trats/trats.c +0 -0
  	ums_board.ums_dev.offset = offset;
  	ums_board.ums_dev.part_size = part_size;
common/cmd_usb_mass_storage.c +1 -0
index 33a4715..62c1308 100644
@@ -14,6 +14,7 @@
  int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
  			       int argc, char * const argv[])
  {
+	struct mmc *mmc = NULL;
  	char *ep;
  	unsigned int dev_num = 0, offset = 0, part_size = 0;
  	int rc;
@@ -21,29 +22,29 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
  	struct ums_board_info *ums_info;
  	static char *s = "ums";
 
Quoted 9 lines

common/cmd_usb_mass_storage.c int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, · line 26

Quoted 6 lines
common/cmd_usb_mass_storage.c +2 -4
-	if (argc < 2) {
-		printf("usage: ums <dev> - e.g. ums 0\n");
-		return 0;
-	}
+	if (argc < 2)
+		return CMD_RET_USAGE;

UMS works on MMC devices only right now?

Yes, it is.

Quoted 14 lines
Quoted 14 lines
common/cmd_usb_mass_storage.c +4 -4
  	dev_num = (int)simple_strtoul(argv[1], &ep, 16);
 
-	if (dev_num) {
-		puts("\nSet eMMC device to 0! - e.g. ums 0\n");
-		goto fail;
+	mmc = find_mmc_device(dev_num);
+	if (!mmc) {
+		printf("UMS error: invalid mmc device num: %d.\n", dev_num);
+		return CMD_RET_FAILURE;
  	}
 
  	board_usb_init();
-	ums_info = board_ums_init(dev_num, offset, part_size);
 
Quoted 8 lines

common/cmd_usb_mass_storage.c int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag, · line 40

Quoted 5 lines
common/cmd_usb_mass_storage.c +2 -2
+	ums_info = board_ums_init(mmc, offset, part_size);
  	if (!ums_info) {
-		printf("MMC: %d -> NOT available\n", dev_num);
-		goto fail;
+		printf("UMS is not supported on this board.\n");

puts()

Right, I will change it in patch v2.

Quoted 33 lines
Quoted 33 lines
common/cmd_usb_mass_storage.c +5 -6
+		return CMD_RET_FAILURE;
  	}
+
  	rc = fsg_init(ums_info);
  	if (rc) {
  		printf("cmd ums: fsg_init failed\n");
-		goto fail;
+		return CMD_RET_FAILURE;
  	}
 
  	g_dnl_register(s);
@@ -61,13 +62,10 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
  	}
  exit:
  	g_dnl_unregister();
-	return 0;
-
-fail:
-	return -1;
+	return CMD_RET_SUCCESS;
  }
 
  U_BOOT_CMD(ums, CONFIG_SYS_MAXARGS, 1, do_usb_mass_storage,
  	"Use the UMS [User Mass Storage]",
-	"ums - User Mass Storage Gadget"
+	"ums <dev> e.g. ums 0"
  );
include/usb_mass_storage.h +0 -0
index 35cdcc3..0f94f31 100644
@@ -34,8 +34,8 @@ extern void board_usb_init(void);
 
Quoted 12 lines

include/usb_mass_storage.h extern void board_usb_init(void); · line 40

Quoted 8 lines
include/usb_mass_storage.h +2 -2
  extern int fsg_init(struct ums_board_info *);
  extern void fsg_cleanup(void);
-extern struct ums_board_info *board_ums_init(unsigned int,
-					     unsigned int, unsigned int);
+extern struct ums_board_info *board_ums_init(struct mmc *, unsigned int,
+						unsigned int);
  extern int usb_gadget_handle_interrupts(void);
  extern int fsg_main_thread(void *);

Best regards,
Marek Vasut

Thank you,

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#4 lore raw

PATCH 1/1 ums: Add "dev num" parameter. Check mmc device before do ums init.

Dear Przemyslaw Marczak,

Quoted 47 lines

Hello Marek,
Thank you for reply.

Quoted 43 lines · Marek Vasut

Dear Przemyslaw Marczak,

Quoted 41 lines

This change allows using every mmc device instance with ums, like eMMC or SD cards. Now MMC device is checked before ums is inited.

Example of use: ums <device_number> for mmc devices.

---

  board/samsung/trats/trats.c   |   12 +++---------
  common/cmd_usb_mass_storage.c |   30 ++++++++++++++----------------
  include/usb_mass_storage.h    |    4 ++--
  3 files changed, 19 insertions(+), 27 deletions(-)
board/samsung/trats/trats.c +1 -7
index 7f61d17..b7f7b05 100644
@@ -816,17 +816,11 @@ static struct ums_board_info ums_board = {
 
  	},
 
  };
 
-struct ums_board_info *board_ums_init(unsigned int dev_num, unsigned
 int offset, -				      unsigned int part_size)
+struct ums_board_info *board_ums_init(struct mmc *mmc, unsigned int
 offset, +					unsigned int part_size)
 
  {
 
-	struct mmc *mmc;
-
-	mmc = find_mmc_device(dev_num);
-	if (!mmc)
-		return NULL;
-
  	ums_board.ums_dev.mmc = mmc;
Quoted 8 lines
Quoted 5 lines

board/samsung/trats/trats.c static struct ums_board_info ums_board = { · line 823

Quoted 2 lines
board/samsung/trats/trats.c +1 -1
-	ums_board.ums_dev.dev_num = dev_num;
+	ums_board.ums_dev.dev_num = mmc->block_dev.dev;

You already pass "mmc", why pass mmc->block_dev.dev too? Is it not a little redundant?

You are right, it is little redundant but pointer to this structure is returned so we expect that structure fields were proper filled, right?

Why not just remove the dev_num field ? The UMS core can retrieve that information itself.

[...]

Best regards,
Marek Vasut

#5 lore raw

PATCH 1/1 ums: Add "dev num" parameter. Check mmc device before do ums init.

Quoted 58 lines · Marek Vasut

Dear Przemyslaw Marczak,

Quoted 47 lines

Hello Marek,
Thank you for reply.

Quoted 43 lines · Marek Vasut

Dear Przemyslaw Marczak,

Quoted 41 lines

This change allows using every mmc device instance with ums, like eMMC or SD cards. Now MMC device is checked before ums is inited.

Example of use: ums <device_number> for mmc devices.

---

   board/samsung/trats/trats.c   |   12 +++---------
   common/cmd_usb_mass_storage.c |   30 ++++++++++++++----------------
   include/usb_mass_storage.h    |    4 ++--
   3 files changed, 19 insertions(+), 27 deletions(-)
board/samsung/trats/trats.c +1 -7
index 7f61d17..b7f7b05 100644
@@ -816,17 +816,11 @@ static struct ums_board_info ums_board = {
 
   	},
 
   };
 
-struct ums_board_info *board_ums_init(unsigned int dev_num, unsigned
 int offset, -				      unsigned int part_size)
+struct ums_board_info *board_ums_init(struct mmc *mmc, unsigned int
 offset, +					unsigned int part_size)
 
   {
 
-	struct mmc *mmc;
-
-	mmc = find_mmc_device(dev_num);
-	if (!mmc)
-		return NULL;
-
   	ums_board.ums_dev.mmc = mmc;
Quoted 8 lines
Quoted 5 lines

board/samsung/trats/trats.c static struct ums_board_info ums_board = { · line 823

Quoted 2 lines
board/samsung/trats/trats.c +1 -1
-	ums_board.ums_dev.dev_num = dev_num;
+	ums_board.ums_dev.dev_num = mmc->block_dev.dev;

You already pass "mmc", why pass mmc->block_dev.dev too? Is it not a little redundant?

You are right, it is little redundant but pointer to this structure is returned so we expect that structure fields were proper filled, right?

Quoted 8 lines

Why not just remove the dev_num field ? The UMS core can retrieve that information itself.

[...]

Best regards,
Marek Vasut

Hello,
I'm making little UMS code refactor now. I will consider your suggestion.

Regards,

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#6 lore raw

PATCH 1/1 arm:mmc:goni/exynos: Fix wrong mmc base register devices offset.

In reply to Przemyslaw Marczak

Hello Minkyu,

Quoted 11 lines · Przemyslaw Marczak

On s5pc1xx mmc devices offset is multiply of 0x100000, wrong value was 0x10000. Register offset always points to mmc 0 before this change.

Add macro definition of mmc dev register offset to s5pc1xx and exynos mmc.

Could you review this patch, please?
Thank you.

Signature · 4 lines
Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com
#7 lore raw

PATCH 1/1 arm:mmc:goni/exynos: Fix wrong mmc base register devices offset.

In reply to Przemyslaw Marczak
Quoted 7 lines · Przemyslaw Marczak

On s5pc1xx mmc devices offset is multiply of 0x100000, wrong value was 0x10000. Register offset always points to mmc 0 before this change.

Add macro definition of mmc dev register offset to s5pc1xx and exynos mmc.

Quoted 9 lines
---
 arch/arm/include/asm/arch-exynos/mmc.h  |    6 +++++-
 arch/arm/include/asm/arch-s5pc1xx/mmc.h |    6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

applied to u-boot-samsung.

Thanks,
Minkyu Kang.