Commit 800370b0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fsi-for-v5.14' of... 

Merge tag 'fsi-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi into char-misc-next

Joel writes:

FSI changes for v5.14

 - Bug fixes for the OCC, SCOM and SBEFIFO drivers

 - Performance fix for aspeed fsi master

 - Small fixes from the mailing lists

* tag 'fsi-for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi:
  fsi/sbefifo: Fix reset timeout
  fsi/sbefifo: Clean up correct FIFO when receiving reset request from SBE
  fsi: master-ast-cf: Remove redundant error printing in fsi_master_acf_probe()
  fsi: Aspeed: Reduce poll timeout
  fsi: aspeed: convert to devm_platform_ioremap_resource
  hwmon: (occ) Print response status in first poll error message
  hwmon: (occ) Start sequence number at one
  fsi: occ: Log error for checksum failure
  fsi: occ: Don't accept response from un-initialized OCC
  fsi: scom: Remove retries
  fsi: scom: Reset the FSI2PIB engine for any error
  fsi: aspeed: Emit fewer barriers in opb operations
  fsi: core: Fix return of error values on failures
  fsi: Add missing MODULE_DEVICE_TABLE
parents 762b296b 9ab1428d

drivers/fsi/fsi-core.c

+2 −2
Original line number Diff line number Diff line
@@ -724,7 +724,7 @@ static ssize_t cfam_read(struct file *filep, char __user *buf, size_t count, 
	rc = count;

 fail:

	*offset = off;

	return count;

	return rc;

}



static ssize_t cfam_write(struct file *filep, const char __user *buf,
@@ -761,7 +761,7 @@ static ssize_t cfam_write(struct file *filep, const char __user *buf, 
	rc = count;

 fail:

	*offset = off;

	return count;

	return rc;

}



static loff_t cfam_llseek(struct file *file, loff_t offset, int whence)

drivers/fsi/fsi-master-aspeed.c

+20 −13
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static const u32 fsi_base = 0xa0000000; 
static u16 aspeed_fsi_divisor = FSI_DIVISOR_DEFAULT;

module_param_named(bus_div,aspeed_fsi_divisor, ushort, 0);



#define OPB_POLL_TIMEOUT		10000

#define OPB_POLL_TIMEOUT		500



static int __opb_write(struct fsi_master_aspeed *aspeed, u32 addr,

		       u32 val, u32 transfer_size)
@@ -101,11 +101,15 @@ static int __opb_write(struct fsi_master_aspeed *aspeed, u32 addr, 
	u32 reg, status;

	int ret;



	writel(CMD_WRITE, base + OPB0_RW);

	writel(transfer_size, base + OPB0_XFER_SIZE);

	writel(addr, base + OPB0_FSI_ADDR);

	writel(val, base + OPB0_FSI_DATA_W);

	writel(0x1, base + OPB_IRQ_CLEAR);

	/*

	 * The ordering of these writes up until the trigger

	 * write does not matter, so use writel_relaxed.

	 */

	writel_relaxed(CMD_WRITE, base + OPB0_RW);

	writel_relaxed(transfer_size, base + OPB0_XFER_SIZE);

	writel_relaxed(addr, base + OPB0_FSI_ADDR);

	writel_relaxed(val, base + OPB0_FSI_DATA_W);

	writel_relaxed(0x1, base + OPB_IRQ_CLEAR);

	writel(0x1, base + OPB_TRIGGER);



	ret = readl_poll_timeout(base + OPB_IRQ_STATUS, reg,
@@ -149,10 +153,14 @@ static int __opb_read(struct fsi_master_aspeed *aspeed, uint32_t addr, 
	u32 result, reg;

	int status, ret;



	writel(CMD_READ, base + OPB0_RW);

	writel(transfer_size, base + OPB0_XFER_SIZE);

	writel(addr, base + OPB0_FSI_ADDR);

	writel(0x1, base + OPB_IRQ_CLEAR);

	/*

	 * The ordering of these writes up until the trigger

	 * write does not matter, so use writel_relaxed.

	 */

	writel_relaxed(CMD_READ, base + OPB0_RW);

	writel_relaxed(transfer_size, base + OPB0_XFER_SIZE);

	writel_relaxed(addr, base + OPB0_FSI_ADDR);

	writel_relaxed(0x1, base + OPB_IRQ_CLEAR);

	writel(0x1, base + OPB_TRIGGER);



	ret = readl_poll_timeout(base + OPB_IRQ_STATUS, reg,
@@ -525,7 +533,6 @@ static int tacoma_cabled_fsi_fixup(struct device *dev) 
static int fsi_master_aspeed_probe(struct platform_device *pdev)

{

	struct fsi_master_aspeed *aspeed;

	struct resource *res;

	int rc, links, reg;

	__be32 raw;
@@ -541,8 +548,7 @@ static int fsi_master_aspeed_probe(struct platform_device *pdev) 


	aspeed->dev = &pdev->dev;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	aspeed->base = devm_ioremap_resource(&pdev->dev, res);

	aspeed->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(aspeed->base))

		return PTR_ERR(aspeed->base);
@@ -645,6 +651,7 @@ static const struct of_device_id fsi_master_aspeed_match[] = { 
	{ .compatible = "aspeed,ast2600-fsi-master" },

	{ },

};

MODULE_DEVICE_TABLE(of, fsi_master_aspeed_match);



static struct platform_driver fsi_master_aspeed_driver = {

	.driver = {

drivers/fsi/fsi-master-ast-cf.c

+1 −1
Original line number Diff line number Diff line
@@ -1309,7 +1309,6 @@ static int fsi_master_acf_probe(struct platform_device *pdev) 
	master->cf_mem = devm_ioremap_resource(&pdev->dev, &res);

 	if (IS_ERR(master->cf_mem)) {

		rc = PTR_ERR(master->cf_mem);

		dev_err(&pdev->dev, "Error %d mapping coldfire memory\n", rc);

 		goto err_free;

	}

	dev_dbg(&pdev->dev, "DRAM allocation @%x\n", master->cf_mem_addr);
@@ -1427,6 +1426,7 @@ static const struct of_device_id fsi_master_acf_match[] = { 
	{ .compatible = "aspeed,ast2500-cf-fsi-master" },

	{ },

};

MODULE_DEVICE_TABLE(of, fsi_master_acf_match);



static struct platform_driver fsi_master_acf = {

	.driver = {

drivers/fsi/fsi-master-gpio.c

+1 −0
Original line number Diff line number Diff line
@@ -882,6 +882,7 @@ static const struct of_device_id fsi_master_gpio_match[] = { 
	{ .compatible = "fsi-master-gpio" },

	{ },

};

MODULE_DEVICE_TABLE(of, fsi_master_gpio_match);



static struct platform_driver fsi_master_gpio_driver = {

	.driver = {

drivers/fsi/fsi-occ.c

+9 −3
Original line number Diff line number Diff line
@@ -223,7 +223,8 @@ static const struct file_operations occ_fops = { 
	.release = occ_release,

};



static int occ_verify_checksum(struct occ_response *resp, u16 data_length)

static int occ_verify_checksum(struct occ *occ, struct occ_response *resp,

			       u16 data_length)

{

	/* Fetch the two bytes after the data for the checksum. */

	u16 checksum_resp = get_unaligned_be16(&resp->data[data_length]);
@@ -238,8 +239,11 @@ static int occ_verify_checksum(struct occ_response *resp, u16 data_length) 
	for (i = 0; i < data_length; ++i)

		checksum += resp->data[i];



	if (checksum != checksum_resp)

	if (checksum != checksum_resp) {

		dev_err(occ->dev, "Bad checksum: %04x!=%04x\n", checksum,

			checksum_resp);

		return -EBADMSG;

	}



	return 0;

}
@@ -495,6 +499,7 @@ int fsi_occ_submit(struct device *dev, const void *request, size_t req_len, 
			goto done;



		if (resp->return_status == OCC_RESP_CMD_IN_PRG ||

		    resp->return_status == OCC_RESP_CRIT_INIT ||

		    resp->seq_no != seq_no) {

			rc = -ETIMEDOUT;
@@ -532,7 +537,7 @@ int fsi_occ_submit(struct device *dev, const void *request, size_t req_len, 
	}



	*resp_len = resp_data_length + 7;

	rc = occ_verify_checksum(resp, resp_data_length);

	rc = occ_verify_checksum(occ, resp, resp_data_length);



 done:

	mutex_unlock(&occ->occ_lock);
@@ -635,6 +640,7 @@ static const struct of_device_id occ_match[] = { 
	},

	{ },

};

MODULE_DEVICE_TABLE(of, occ_match);



static struct platform_driver occ_driver = {

	.driver = {