Adding qemu as a submodule of KVMFORNFV

This Patch includes the changes to add qemu as a submodule to
kvmfornfv repo and make use of the updated latest qemu for the
execution of all testcase
Change-Id: I1280af507a857675c7f81d30c95255635667bdd7
Signed-off-by:RajithaY<rajithax.yerrumsetty@intel.com>

1 files changed, 0 insertions, 381 deletions

diff --git a/qemu/roms/u-boot/drivers/mmc/arm_pl180_mmci.c b/qemu/roms/u-boot/drivers/mmc/arm_pl180_mmci.c
deleted file mode 100644
index 5ef7ff7ff..000000000
--- a/qemu/roms/u-boot/drivers/mmc/arm_pl180_mmci.c
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * ARM PrimeCell MultiMedia Card Interface - PL180
- *
- * Copyright (C) ST-Ericsson SA 2010
- *
- * Author: Ulf Hansson <ulf.hansson@stericsson.com>
- * Author: Martin Lundholm <martin.xa.lundholm@stericsson.com>
- * Ported to drivers/mmc/ by: Matt Waddel <matt.waddel@linaro.org>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-/* #define DEBUG */
-
-#include <asm/io.h>
-#include "common.h"
-#include <errno.h>
-#include <mmc.h>
-#include "arm_pl180_mmci.h"
-#include <malloc.h>
-
-static int wait_for_command_end(struct mmc *dev, struct mmc_cmd *cmd)
-{
-	u32 hoststatus, statusmask;
-	struct pl180_mmc_host *host = dev->priv;
-
-	statusmask = SDI_STA_CTIMEOUT | SDI_STA_CCRCFAIL;
-	if ((cmd->resp_type & MMC_RSP_PRESENT))
-		statusmask |= SDI_STA_CMDREND;
-	else
-		statusmask |= SDI_STA_CMDSENT;
-
-	do
-		hoststatus = readl(&host->base->status) & statusmask;
-	while (!hoststatus);
-
-	writel(statusmask, &host->base->status_clear);
-	if (hoststatus & SDI_STA_CTIMEOUT) {
-		debug("CMD%d time out\n", cmd->cmdidx);
-		return TIMEOUT;
-	} else if ((hoststatus & SDI_STA_CCRCFAIL) &&
-		   (cmd->resp_type & MMC_RSP_CRC)) {
-		printf("CMD%d CRC error\n", cmd->cmdidx);
-		return -EILSEQ;
-	}
-
-	if (cmd->resp_type & MMC_RSP_PRESENT) {
-		cmd->response[0] = readl(&host->base->response0);
-		cmd->response[1] = readl(&host->base->response1);
-		cmd->response[2] = readl(&host->base->response2);
-		cmd->response[3] = readl(&host->base->response3);
-		debug("CMD%d response[0]:0x%08X, response[1]:0x%08X, "
-			"response[2]:0x%08X, response[3]:0x%08X\n",
-			cmd->cmdidx, cmd->response[0], cmd->response[1],
-			cmd->response[2], cmd->response[3]);
-	}
-
-	return 0;
-}
-
-/* send command to the mmc card and wait for results */
-static int do_command(struct mmc *dev, struct mmc_cmd *cmd)
-{
-	int result;
-	u32 sdi_cmd = 0;
-	struct pl180_mmc_host *host = dev->priv;
-
-	sdi_cmd = ((cmd->cmdidx & SDI_CMD_CMDINDEX_MASK) | SDI_CMD_CPSMEN);
-
-	if (cmd->resp_type) {
-		sdi_cmd |= SDI_CMD_WAITRESP;
-		if (cmd->resp_type & MMC_RSP_136)
-			sdi_cmd |= SDI_CMD_LONGRESP;
-	}
-
-	writel((u32)cmd->cmdarg, &host->base->argument);
-	udelay(COMMAND_REG_DELAY);
-	writel(sdi_cmd, &host->base->command);
-	result = wait_for_command_end(dev, cmd);
-
-	/* After CMD2 set RCA to a none zero value. */
-	if ((result == 0) && (cmd->cmdidx == MMC_CMD_ALL_SEND_CID))
-		dev->rca = 10;
-
-	/* After CMD3 open drain is switched off and push pull is used. */
-	if ((result == 0) && (cmd->cmdidx == MMC_CMD_SET_RELATIVE_ADDR)) {
-		u32 sdi_pwr = readl(&host->base->power) & ~SDI_PWR_OPD;
-		writel(sdi_pwr, &host->base->power);
-	}
-
-	return result;
-}
-
-static int read_bytes(struct mmc *dev, u32 *dest, u32 blkcount, u32 blksize)
-{
-	u32 *tempbuff = dest;
-	u64 xfercount = blkcount * blksize;
-	struct pl180_mmc_host *host = dev->priv;
-	u32 status, status_err;
-
-	debug("read_bytes: blkcount=%u blksize=%u\n", blkcount, blksize);
-
-	status = readl(&host->base->status);
-	status_err = status & (SDI_STA_DCRCFAIL | SDI_STA_DTIMEOUT |
-			       SDI_STA_RXOVERR);
-	while ((!status_err) && (xfercount >= sizeof(u32))) {
-		if (status & SDI_STA_RXDAVL) {
-			*(tempbuff) = readl(&host->base->fifo);
-			tempbuff++;
-			xfercount -= sizeof(u32);
-		}
-		status = readl(&host->base->status);
-		status_err = status & (SDI_STA_DCRCFAIL | SDI_STA_DTIMEOUT |
-				       SDI_STA_RXOVERR);
-	}
-
-	status_err = status &
-		(SDI_STA_DCRCFAIL | SDI_STA_DTIMEOUT | SDI_STA_DBCKEND |
-		 SDI_STA_RXOVERR);
-	while (!status_err) {
-		status = readl(&host->base->status);
-		status_err = status &
-			(SDI_STA_DCRCFAIL | SDI_STA_DTIMEOUT | SDI_STA_DBCKEND |
-			 SDI_STA_RXOVERR);
-	}
-
-	if (status & SDI_STA_DTIMEOUT) {
-		printf("Read data timed out, xfercount: %llu, status: 0x%08X\n",
-			xfercount, status);
-		return -ETIMEDOUT;
-	} else if (status & SDI_STA_DCRCFAIL) {
-		printf("Read data bytes CRC error: 0x%x\n", status);
-		return -EILSEQ;
-	} else if (status & SDI_STA_RXOVERR) {
-		printf("Read data RX overflow error\n");
-		return -EIO;
-	}
-
-	writel(SDI_ICR_MASK, &host->base->status_clear);
-
-	if (xfercount) {
-		printf("Read data error, xfercount: %llu\n", xfercount);
-		return -ENOBUFS;
-	}
-
-	return 0;
-}
-
-static int write_bytes(struct mmc *dev, u32 *src, u32 blkcount, u32 blksize)
-{
-	u32 *tempbuff = src;
-	int i;
-	u64 xfercount = blkcount * blksize;
-	struct pl180_mmc_host *host = dev->priv;
-	u32 status, status_err;
-
-	debug("write_bytes: blkcount=%u blksize=%u\n", blkcount, blksize);
-
-	status = readl(&host->base->status);
-	status_err = status & (SDI_STA_DCRCFAIL | SDI_STA_DTIMEOUT);
-	while (!status_err && xfercount) {
-		if (status & SDI_STA_TXFIFOBW) {
-			if (xfercount >= SDI_FIFO_BURST_SIZE * sizeof(u32)) {
-				for (i = 0; i < SDI_FIFO_BURST_SIZE; i++)
-					writel(*(tempbuff + i),
-						&host->base->fifo);
-				tempbuff += SDI_FIFO_BURST_SIZE;
-				xfercount -= SDI_FIFO_BURST_SIZE * sizeof(u32);
-			} else {
-				while (xfercount >= sizeof(u32)) {
-					writel(*(tempbuff), &host->base->fifo);
-					tempbuff++;
-					xfercount -= sizeof(u32);
-				}
-			}
-		}
-		status = readl(&host->base->status);
-		status_err = status & (SDI_STA_DCRCFAIL | SDI_STA_DTIMEOUT);
-	}
-
-	status_err = status &
-		(SDI_STA_DCRCFAIL | SDI_STA_DTIMEOUT | SDI_STA_DBCKEND);
-	while (!status_err) {
-		status = readl(&host->base->status);
-		status_err = status &
-			(SDI_STA_DCRCFAIL | SDI_STA_DTIMEOUT | SDI_STA_DBCKEND);
-	}
-
-	if (status & SDI_STA_DTIMEOUT) {
-		printf("Write data timed out, xfercount:%llu,status:0x%08X\n",
-		       xfercount, status);
-		return -ETIMEDOUT;
-	} else if (status & SDI_STA_DCRCFAIL) {
-		printf("Write data CRC error\n");
-		return -EILSEQ;
-	}
-
-	writel(SDI_ICR_MASK, &host->base->status_clear);
-
-	if (xfercount) {
-		printf("Write data error, xfercount:%llu", xfercount);
-		return -ENOBUFS;
-	}
-
-	return 0;
-}
-
-static int do_data_transfer(struct mmc *dev,
-			    struct mmc_cmd *cmd,
-			    struct mmc_data *data)
-{
-	int error = -ETIMEDOUT;
-	struct pl180_mmc_host *host = dev->priv;
-	u32 blksz = 0;
-	u32 data_ctrl = 0;
-	u32 data_len = (u32) (data->blocks * data->blocksize);
-
-	if (!host->version2) {
-		blksz = (ffs(data->blocksize) - 1);
-		data_ctrl |= ((blksz << 4) & SDI_DCTRL_DBLKSIZE_MASK);
-	} else {
-		blksz = data->blocksize;
-		data_ctrl |= (blksz << SDI_DCTRL_DBLOCKSIZE_V2_SHIFT);
-	}
-	data_ctrl |= SDI_DCTRL_DTEN | SDI_DCTRL_BUSYMODE;
-
-	writel(SDI_DTIMER_DEFAULT, &host->base->datatimer);
-	writel(data_len, &host->base->datalength);
-	udelay(DATA_REG_DELAY);
-
-	if (data->flags & MMC_DATA_READ) {
-		data_ctrl |= SDI_DCTRL_DTDIR_IN;
-		writel(data_ctrl, &host->base->datactrl);
-
-		error = do_command(dev, cmd);
-		if (error)
-			return error;
-
-		error = read_bytes(dev, (u32 *)data->dest, (u32)data->blocks,
-				   (u32)data->blocksize);
-	} else if (data->flags & MMC_DATA_WRITE) {
-		error = do_command(dev, cmd);
-		if (error)
-			return error;
-
-		writel(data_ctrl, &host->base->datactrl);
-		error = write_bytes(dev, (u32 *)data->src, (u32)data->blocks,
-							(u32)data->blocksize);
-	}
-
-	return error;
-}
-
-static int host_request(struct mmc *dev,
-			struct mmc_cmd *cmd,
-			struct mmc_data *data)
-{
-	int result;
-
-	if (data)
-		result = do_data_transfer(dev, cmd, data);
-	else
-		result = do_command(dev, cmd);
-
-	return result;
-}
-
-/* MMC uses open drain drivers in the enumeration phase */
-static int mmc_host_reset(struct mmc *dev)
-{
-	struct pl180_mmc_host *host = dev->priv;
-
-	writel(host->pwr_init, &host->base->power);
-
-	return 0;
-}
-
-static void host_set_ios(struct mmc *dev)
-{
-	struct pl180_mmc_host *host = dev->priv;
-	u32 sdi_clkcr;
-
-	sdi_clkcr = readl(&host->base->clock);
-
-	/* Ramp up the clock rate */
-	if (dev->clock) {
-		u32 clkdiv = 0;
-		u32 tmp_clock;
-
-		if (dev->clock >= dev->cfg->f_max) {
-			clkdiv = 0;
-			dev->clock = dev->cfg->f_max;
-		} else {
-			clkdiv = (host->clock_in / dev->clock) - 2;
-		}
-
-		tmp_clock = host->clock_in / (clkdiv + 2);
-		while (tmp_clock > dev->clock) {
-			clkdiv++;
-			tmp_clock = host->clock_in / (clkdiv + 2);
-		}
-
-		if (clkdiv > SDI_CLKCR_CLKDIV_MASK)
-			clkdiv = SDI_CLKCR_CLKDIV_MASK;
-
-		tmp_clock = host->clock_in / (clkdiv + 2);
-		dev->clock = tmp_clock;
-		sdi_clkcr &= ~(SDI_CLKCR_CLKDIV_MASK);
-		sdi_clkcr |= clkdiv;
-	}
-
-	/* Set the bus width */
-	if (dev->bus_width) {
-		u32 buswidth = 0;
-
-		switch (dev->bus_width) {
-		case 1:
-			buswidth |= SDI_CLKCR_WIDBUS_1;
-			break;
-		case 4:
-			buswidth |= SDI_CLKCR_WIDBUS_4;
-			break;
-		case 8:
-			buswidth |= SDI_CLKCR_WIDBUS_8;
-			break;
-		default:
-			printf("Invalid bus width: %d\n", dev->bus_width);
-			break;
-		}
-		sdi_clkcr &= ~(SDI_CLKCR_WIDBUS_MASK);
-		sdi_clkcr |= buswidth;
-	}
-
-	writel(sdi_clkcr, &host->base->clock);
-	udelay(CLK_CHANGE_DELAY);
-}
-
-static const struct mmc_ops arm_pl180_mmci_ops = {
-	.send_cmd = host_request,
-	.set_ios = host_set_ios,
-	.init = mmc_host_reset,
-};
-
-/*
- * mmc_host_init - initialize the mmc controller.
- * Set initial clock and power for mmc slot.
- * Initialize mmc struct and register with mmc framework.
- */
-int arm_pl180_mmci_init(struct pl180_mmc_host *host)
-{
-	struct mmc *mmc;
-	u32 sdi_u32;
-
-	writel(host->pwr_init, &host->base->power);
-	writel(host->clkdiv_init, &host->base->clock);
-	udelay(CLK_CHANGE_DELAY);
-
-	/* Disable mmc interrupts */
-	sdi_u32 = readl(&host->base->mask0) & ~SDI_MASK0_MASK;
-	writel(sdi_u32, &host->base->mask0);
-
-	host->cfg.name = host->name;
-	host->cfg.ops = &arm_pl180_mmci_ops;
-	/* TODO remove the duplicates */
-	host->cfg.host_caps = host->caps;
-	host->cfg.voltages = host->voltages;
-	host->cfg.f_min = host->clock_min;
-	host->cfg.f_max = host->clock_max;
-	if (host->b_max != 0)
-		host->cfg.b_max = host->b_max;
-	else
-		host->cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;
-
-	mmc = mmc_create(&host->cfg, host);
-	if (mmc == NULL)
-		return -1;
-
-	debug("registered mmc interface number is:%d\n", mmc->block_dev.dev);
-
-	return 0;
-}