Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf821e8f authored by Alex Dubov's avatar Alex Dubov Committed by Linus Torvalds
Browse files

memstick: optimize setup of JMicron host parameters 



Set correct clock management values to improve over-all performance.

Signed-off-by: default avatarAlex Dubov <oakad@yahoo.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 962ee1b1

drivers/memstick/host/jmb38x_ms.c

+30 −30
Original line number Original line Diff line number Diff line
@@ -131,6 +131,12 @@ struct jmb38x_ms { 
#define PAD_PU_PD_ON_MS_SOCK0 0x5f8f0000

#define PAD_PU_PD_ON_MS_SOCK0 0x5f8f0000

#define PAD_PU_PD_ON_MS_SOCK1 0x0f0f0000

#define PAD_PU_PD_ON_MS_SOCK1 0x0f0f0000





#define CLOCK_CONTROL_40MHZ   0x00000001

#define CLOCK_CONTROL_50MHZ   0x00000002

#define CLOCK_CONTROL_60MHZ   0x00000008

#define CLOCK_CONTROL_62_5MHZ 0x0000000c

#define CLOCK_CONTROL_OFF     0x00000000



enum {

enum {

	CMD_READY    = 0x01,

	CMD_READY    = 0x01,

	FIFO_READY   = 0x02,

	FIFO_READY   = 0x02,
@@ -607,19 +613,18 @@ static void jmb38x_ms_reset(struct jmb38x_ms_host *host) 
{

{

	unsigned int host_ctl = readl(host->addr + HOST_CONTROL);

	unsigned int host_ctl = readl(host->addr + HOST_CONTROL);





	writel(host_ctl | HOST_CONTROL_RESET_REQ | HOST_CONTROL_RESET,

	writel(HOST_CONTROL_RESET_REQ, host->addr + HOST_CONTROL);

	       host->addr + HOST_CONTROL);





	while (HOST_CONTROL_RESET_REQ

	while (HOST_CONTROL_RESET_REQ

	       & (host_ctl = readl(host->addr + HOST_CONTROL))) {

	       & (host_ctl = readl(host->addr + HOST_CONTROL))) {

		ndelay(100);

		ndelay(20);

		dev_dbg(&host->chip->pdev->dev, "reset\n");

		dev_dbg(&host->chip->pdev->dev, "reset %08x\n", host_ctl);

	}

	}





	writel(INT_STATUS_ALL, host->addr + INT_STATUS_ENABLE);

	writel(HOST_CONTROL_RESET, host->addr + HOST_CONTROL);

	mmiowb();

	writel(INT_STATUS_ALL, host->addr + INT_SIGNAL_ENABLE);

	writel(INT_STATUS_ALL, host->addr + INT_SIGNAL_ENABLE);



	writel(INT_STATUS_ALL, host->addr + INT_STATUS_ENABLE);

	dev_dbg(&host->chip->pdev->dev, "reset\n");

}

}





static void jmb38x_ms_set_param(struct memstick_host *msh,

static void jmb38x_ms_set_param(struct memstick_host *msh,
@@ -627,10 +632,8 @@ static void jmb38x_ms_set_param(struct memstick_host *msh, 
				int value)

				int value)

{

{

	struct jmb38x_ms_host *host = memstick_priv(msh);

	struct jmb38x_ms_host *host = memstick_priv(msh);

	unsigned int host_ctl;

	unsigned int host_ctl = readl(host->addr + HOST_CONTROL);

	unsigned long flags;

	unsigned int clock_ctl = CLOCK_CONTROL_40MHZ, clock_delay = 0;



	spin_lock_irqsave(&host->lock, flags);





	switch (param) {

	switch (param) {

	case MEMSTICK_POWER:

	case MEMSTICK_POWER:
@@ -644,54 +647,51 @@ static void jmb38x_ms_set_param(struct memstick_host *msh, 
			writel(PAD_OUTPUT_ENABLE_MS,

			writel(PAD_OUTPUT_ENABLE_MS,

			       host->addr + PAD_OUTPUT_ENABLE);

			       host->addr + PAD_OUTPUT_ENABLE);





			host_ctl = readl(host->addr + HOST_CONTROL);

			host_ctl = 7;

			host_ctl |= 7;

			host_ctl |= HOST_CONTROL_POWER_EN

			writel(host_ctl | (HOST_CONTROL_POWER_EN

				 | HOST_CONTROL_CLOCK_EN;

					   | HOST_CONTROL_CLOCK_EN),

			writel(host_ctl, host->addr + HOST_CONTROL);

			       host->addr + HOST_CONTROL);





			dev_dbg(&host->chip->pdev->dev, "power on\n");

			dev_dbg(&host->chip->pdev->dev, "power on\n");

		} else if (value == MEMSTICK_POWER_OFF) {

		} else if (value == MEMSTICK_POWER_OFF) {

			writel(readl(host->addr + HOST_CONTROL)

			host_ctl &= ~(HOST_CONTROL_POWER_EN

			       & ~(HOST_CONTROL_POWER_EN

				      | HOST_CONTROL_CLOCK_EN);

				   | HOST_CONTROL_CLOCK_EN),

			writel(host_ctl, host->addr +  HOST_CONTROL);

			       host->addr +  HOST_CONTROL);

			writel(0, host->addr + PAD_OUTPUT_ENABLE);

			writel(0, host->addr + PAD_OUTPUT_ENABLE);

			writel(PAD_PU_PD_OFF, host->addr + PAD_PU_PD);

			writel(PAD_PU_PD_OFF, host->addr + PAD_PU_PD);

			dev_dbg(&host->chip->pdev->dev, "power off\n");

			dev_dbg(&host->chip->pdev->dev, "power off\n");

		}

		}

		break;

		break;

	case MEMSTICK_INTERFACE:

	case MEMSTICK_INTERFACE:

		/* jmb38x_ms_reset(host); */



		host_ctl = readl(host->addr + HOST_CONTROL);

		host_ctl &= ~(3 << HOST_CONTROL_IF_SHIFT);

		host_ctl &= ~(3 << HOST_CONTROL_IF_SHIFT);

		/* host_ctl |= 7; */





		if (value == MEMSTICK_SERIAL) {

		if (value == MEMSTICK_SERIAL) {

			host_ctl &= ~HOST_CONTROL_FAST_CLK;

			host_ctl &= ~HOST_CONTROL_FAST_CLK;

			host_ctl |= HOST_CONTROL_IF_SERIAL

			host_ctl |= HOST_CONTROL_IF_SERIAL

				    << HOST_CONTROL_IF_SHIFT;

				    << HOST_CONTROL_IF_SHIFT;

			host_ctl |= HOST_CONTROL_REI;

			host_ctl |= HOST_CONTROL_REI;

			writel(0, host->addr + CLOCK_DELAY);

			clock_ctl = CLOCK_CONTROL_40MHZ;

			clock_delay = 0;

		} else if (value == MEMSTICK_PAR4) {

		} else if (value == MEMSTICK_PAR4) {

			host_ctl |= HOST_CONTROL_FAST_CLK;

			host_ctl |= HOST_CONTROL_FAST_CLK;

			host_ctl |= HOST_CONTROL_IF_PAR4

			host_ctl |= HOST_CONTROL_IF_PAR4

				    << HOST_CONTROL_IF_SHIFT;

				    << HOST_CONTROL_IF_SHIFT;

			host_ctl &= ~HOST_CONTROL_REI;

			host_ctl &= ~HOST_CONTROL_REI;

			writel(4, host->addr + CLOCK_DELAY);

			clock_ctl = CLOCK_CONTROL_40MHZ;

			clock_delay = 4;

		} else if (value == MEMSTICK_PAR8) {

		} else if (value == MEMSTICK_PAR8) {

			host_ctl |= HOST_CONTROL_FAST_CLK;

			host_ctl |= HOST_CONTROL_FAST_CLK;

			host_ctl |= HOST_CONTROL_IF_PAR8

			host_ctl |= HOST_CONTROL_IF_PAR8

				    << HOST_CONTROL_IF_SHIFT;

				    << HOST_CONTROL_IF_SHIFT;

			host_ctl &= ~HOST_CONTROL_REI;

			host_ctl &= ~HOST_CONTROL_REI;

			writel(4, host->addr + CLOCK_DELAY);

			clock_ctl = CLOCK_CONTROL_60MHZ;

			clock_delay = 0;

		}

		}

		writel(host_ctl, host->addr + HOST_CONTROL);

		writel(host_ctl, host->addr + HOST_CONTROL);

		writel(clock_ctl, host->addr + CLOCK_CONTROL);

		writel(clock_delay, host->addr + CLOCK_DELAY);

		break;

		break;

	};

	};



	spin_unlock_irqrestore(&host->lock, flags);

}

}





#ifdef CONFIG_PM

#ifdef CONFIG_PM