mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] ARM: rpi: fix reading of the EMMC clock for CONFIG_MMU
@ 2013-10-15 17:38 Andre Heider
  2013-10-16  7:32 ` Lucas Stach
  2013-10-16  7:37 ` Sascha Hauer
  0 siblings, 2 replies; 4+ messages in thread
From: Andre Heider @ 2013-10-15 17:38 UTC (permalink / raw)
  To: barebox

Add explicit flushing to prevent the 50MHz fallback.

Signed-off-by: Andre Heider <a.heider@gmail.com>
---
 drivers/mci/mci-bcm2835.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/mci/mci-bcm2835.c b/drivers/mci/mci-bcm2835.c
index a0c364d..2ffdeec 100644
--- a/drivers/mci/mci-bcm2835.c
+++ b/drivers/mci/mci-bcm2835.c
@@ -28,6 +28,7 @@
  * Author: Wilhelm Lundgren <wilhelm.lundgren@cybercom.com>
  */
 
+#include <asm/mmu.h>
 #include <common.h>
 #include <init.h>
 #include <mci.h>
@@ -471,7 +472,7 @@ int bcm2835_mci_reset(struct mci_host *mci, struct device_d *mci_dev)
 static u32 bcm2835_mci_get_emmc_clock(struct msg_get_clock_rate *clk_data)
 {
 	u32 val;
-	struct bcm2835_mbox_regs *regs =
+	struct bcm2835_mbox_regs __iomem *regs =
 			(struct bcm2835_mbox_regs *) BCM2835_MBOX_PHYSADDR;
 
 	/*Read out old msg*/
@@ -489,6 +490,7 @@ static u32 bcm2835_mci_get_emmc_clock(struct msg_get_clock_rate *clk_data)
 			break;
 	}
 	val = BCM2835_MBOX_PROP_CHAN + ((u32) &clk_data->hdr);
+	dma_flush_range((u32)clk_data, (u32)clk_data + sizeof(*clk_data));
 	writel(val, &regs->write);
 
 	while (true) {
@@ -504,6 +506,9 @@ static u32 bcm2835_mci_get_emmc_clock(struct msg_get_clock_rate *clk_data)
 		if ((val & 0x0F) == BCM2835_MBOX_PROP_CHAN)
 			break;
 	}
+
+	dma_inv_range((u32)clk_data, (u32)clk_data + sizeof(*clk_data));
+
 	if ((val & ~0x0F) == ((u32) &clk_data->hdr))
 		if (clk_data->get_clock_rate.tag_hdr.val_len
 				& BCM2835_MBOX_TAG_VAL_LEN_RESPONSE)
-- 
1.8.3.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: rpi: fix reading of the EMMC clock for CONFIG_MMU
  2013-10-15 17:38 [PATCH] ARM: rpi: fix reading of the EMMC clock for CONFIG_MMU Andre Heider
@ 2013-10-16  7:32 ` Lucas Stach
  2013-10-16  9:00   ` Andre Heider
  2013-10-16  7:37 ` Sascha Hauer
  1 sibling, 1 reply; 4+ messages in thread
From: Lucas Stach @ 2013-10-16  7:32 UTC (permalink / raw)
  To: Andre Heider; +Cc: barebox

Am Dienstag, den 15.10.2013, 19:38 +0200 schrieb Andre Heider:
> Add explicit flushing to prevent the 50MHz fallback.
> 
Uh, this is pretty ugly. We certainly don't want all those explicit
invalidates/flushes in the driver code. Isn't it possible to push this
into some helper functions, that do the right thing when communicating
with the mailboxes?

> Signed-off-by: Andre Heider <a.heider@gmail.com>
> ---
>  drivers/mci/mci-bcm2835.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mci/mci-bcm2835.c b/drivers/mci/mci-bcm2835.c
> index a0c364d..2ffdeec 100644
> --- a/drivers/mci/mci-bcm2835.c
> +++ b/drivers/mci/mci-bcm2835.c
> @@ -28,6 +28,7 @@
>   * Author: Wilhelm Lundgren <wilhelm.lundgren@cybercom.com>
>   */
>  
> +#include <asm/mmu.h>
>  #include <common.h>
>  #include <init.h>
>  #include <mci.h>
> @@ -471,7 +472,7 @@ int bcm2835_mci_reset(struct mci_host *mci, struct device_d *mci_dev)
>  static u32 bcm2835_mci_get_emmc_clock(struct msg_get_clock_rate *clk_data)
>  {
>  	u32 val;
> -	struct bcm2835_mbox_regs *regs =
> +	struct bcm2835_mbox_regs __iomem *regs =
>  			(struct bcm2835_mbox_regs *) BCM2835_MBOX_PHYSADDR;
>  
>  	/*Read out old msg*/
> @@ -489,6 +490,7 @@ static u32 bcm2835_mci_get_emmc_clock(struct msg_get_clock_rate *clk_data)
>  			break;
>  	}
>  	val = BCM2835_MBOX_PROP_CHAN + ((u32) &clk_data->hdr);
> +	dma_flush_range((u32)clk_data, (u32)clk_data + sizeof(*clk_data));
>  	writel(val, &regs->write);
>  
>  	while (true) {
> @@ -504,6 +506,9 @@ static u32 bcm2835_mci_get_emmc_clock(struct msg_get_clock_rate *clk_data)
>  		if ((val & 0x0F) == BCM2835_MBOX_PROP_CHAN)
>  			break;
>  	}
> +
> +	dma_inv_range((u32)clk_data, (u32)clk_data + sizeof(*clk_data));
> +
>  	if ((val & ~0x0F) == ((u32) &clk_data->hdr))
>  		if (clk_data->get_clock_rate.tag_hdr.val_len
>  				& BCM2835_MBOX_TAG_VAL_LEN_RESPONSE)

-- 
Pengutronix e.K.                           | Lucas Stach                 |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-5076 |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: rpi: fix reading of the EMMC clock for CONFIG_MMU
  2013-10-15 17:38 [PATCH] ARM: rpi: fix reading of the EMMC clock for CONFIG_MMU Andre Heider
  2013-10-16  7:32 ` Lucas Stach
@ 2013-10-16  7:37 ` Sascha Hauer
  1 sibling, 0 replies; 4+ messages in thread
From: Sascha Hauer @ 2013-10-16  7:37 UTC (permalink / raw)
  To: Andre Heider; +Cc: barebox

On Tue, Oct 15, 2013 at 07:38:23PM +0200, Andre Heider wrote:
> Add explicit flushing to prevent the 50MHz fallback.

Oops, I saw the message but didn't notice I introduced it.

The bcm2835_mci_get_emmc_clock() seems to use some mailbox system to get
the clock (from the graphics core?). We should probably convert this
into some generic code to access these bcm2835 mailboxes. Maybe U-Boot or
the kernel already provide code for it.

Anyway, applied this patch for now.

Sascha

> 
> Signed-off-by: Andre Heider <a.heider@gmail.com>
> ---
>  drivers/mci/mci-bcm2835.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/mci/mci-bcm2835.c b/drivers/mci/mci-bcm2835.c
> index a0c364d..2ffdeec 100644
> --- a/drivers/mci/mci-bcm2835.c
> +++ b/drivers/mci/mci-bcm2835.c
> @@ -28,6 +28,7 @@
>   * Author: Wilhelm Lundgren <wilhelm.lundgren@cybercom.com>
>   */
>  
> +#include <asm/mmu.h>
>  #include <common.h>
>  #include <init.h>
>  #include <mci.h>
> @@ -471,7 +472,7 @@ int bcm2835_mci_reset(struct mci_host *mci, struct device_d *mci_dev)
>  static u32 bcm2835_mci_get_emmc_clock(struct msg_get_clock_rate *clk_data)
>  {
>  	u32 val;
> -	struct bcm2835_mbox_regs *regs =
> +	struct bcm2835_mbox_regs __iomem *regs =
>  			(struct bcm2835_mbox_regs *) BCM2835_MBOX_PHYSADDR;
>  
>  	/*Read out old msg*/
> @@ -489,6 +490,7 @@ static u32 bcm2835_mci_get_emmc_clock(struct msg_get_clock_rate *clk_data)
>  			break;
>  	}
>  	val = BCM2835_MBOX_PROP_CHAN + ((u32) &clk_data->hdr);
> +	dma_flush_range((u32)clk_data, (u32)clk_data + sizeof(*clk_data));
>  	writel(val, &regs->write);
>  
>  	while (true) {
> @@ -504,6 +506,9 @@ static u32 bcm2835_mci_get_emmc_clock(struct msg_get_clock_rate *clk_data)
>  		if ((val & 0x0F) == BCM2835_MBOX_PROP_CHAN)
>  			break;
>  	}
> +
> +	dma_inv_range((u32)clk_data, (u32)clk_data + sizeof(*clk_data));
> +
>  	if ((val & ~0x0F) == ((u32) &clk_data->hdr))
>  		if (clk_data->get_clock_rate.tag_hdr.val_len
>  				& BCM2835_MBOX_TAG_VAL_LEN_RESPONSE)
> -- 
> 1.8.3.2
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: rpi: fix reading of the EMMC clock for CONFIG_MMU
  2013-10-16  7:32 ` Lucas Stach
@ 2013-10-16  9:00   ` Andre Heider
  0 siblings, 0 replies; 4+ messages in thread
From: Andre Heider @ 2013-10-16  9:00 UTC (permalink / raw)
  To: Lucas Stach; +Cc: barebox

On Wed, Oct 16, 2013 at 09:32:09AM +0200, Lucas Stach wrote:
> Am Dienstag, den 15.10.2013, 19:38 +0200 schrieb Andre Heider:
> > Add explicit flushing to prevent the 50MHz fallback.
> > 
> Uh, this is pretty ugly. We certainly don't want all those explicit
> invalidates/flushes in the driver code. Isn't it possible to push this
> into some helper functions, that do the right thing when communicating
> with the mailboxes?

Sure, as of now this was just the only mbox user. So I hacked away to
prevent regressions under CONFIG_MMU ;)

But I planned to work on exactly that, since we want to use mbox for
other things too (like setting up simplefb for the kernel).

Regards,
Andre

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-10-16  9:00 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-15 17:38 [PATCH] ARM: rpi: fix reading of the EMMC clock for CONFIG_MMU Andre Heider
2013-10-16  7:32 ` Lucas Stach
2013-10-16  9:00   ` Andre Heider
2013-10-16  7:37 ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox