IB/hfi1: Remove EPROM functionality from data device
Remove EPROM handling from the cdev which is used for user application data traffic. Reviewed-by: Dean Luick <dean.luick@intel.com> Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com> Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
parent
7312f29d8e
commit
d079031742
|
@ -49,387 +49,18 @@
|
|||
#include "common.h"
|
||||
#include "eprom.h"
|
||||
|
||||
/*
|
||||
* The EPROM is logically divided into three partitions:
|
||||
* partition 0: the first 128K, visible from PCI ROM BAR
|
||||
* partition 1: 4K config file (sector size)
|
||||
* partition 2: the rest
|
||||
*/
|
||||
#define P0_SIZE (128 * 1024)
|
||||
#define P1_SIZE (4 * 1024)
|
||||
#define P1_START P0_SIZE
|
||||
#define P2_START (P0_SIZE + P1_SIZE)
|
||||
|
||||
/* erase sizes supported by the controller */
|
||||
#define SIZE_4KB (4 * 1024)
|
||||
#define MASK_4KB (SIZE_4KB - 1)
|
||||
|
||||
#define SIZE_32KB (32 * 1024)
|
||||
#define MASK_32KB (SIZE_32KB - 1)
|
||||
|
||||
#define SIZE_64KB (64 * 1024)
|
||||
#define MASK_64KB (SIZE_64KB - 1)
|
||||
|
||||
/* controller page size, in bytes */
|
||||
#define EP_PAGE_SIZE 256
|
||||
#define EEP_PAGE_MASK (EP_PAGE_SIZE - 1)
|
||||
|
||||
/* controller commands */
|
||||
#define CMD_SHIFT 24
|
||||
#define CMD_NOP (0)
|
||||
#define CMD_PAGE_PROGRAM(addr) ((0x02 << CMD_SHIFT) | addr)
|
||||
#define CMD_READ_DATA(addr) ((0x03 << CMD_SHIFT) | addr)
|
||||
#define CMD_READ_SR1 ((0x05 << CMD_SHIFT))
|
||||
#define CMD_WRITE_ENABLE ((0x06 << CMD_SHIFT))
|
||||
#define CMD_SECTOR_ERASE_4KB(addr) ((0x20 << CMD_SHIFT) | addr)
|
||||
#define CMD_SECTOR_ERASE_32KB(addr) ((0x52 << CMD_SHIFT) | addr)
|
||||
#define CMD_CHIP_ERASE ((0x60 << CMD_SHIFT))
|
||||
#define CMD_READ_MANUF_DEV_ID ((0x90 << CMD_SHIFT))
|
||||
#define CMD_RELEASE_POWERDOWN_NOID ((0xab << CMD_SHIFT))
|
||||
#define CMD_SECTOR_ERASE_64KB(addr) ((0xd8 << CMD_SHIFT) | addr)
|
||||
|
||||
/* controller interface speeds */
|
||||
#define EP_SPEED_FULL 0x2 /* full speed */
|
||||
|
||||
/* controller status register 1 bits */
|
||||
#define SR1_BUSY 0x1ull /* the BUSY bit in SR1 */
|
||||
|
||||
/* sleep length while waiting for controller */
|
||||
#define WAIT_SLEEP_US 100 /* must be larger than 5 (see usage) */
|
||||
#define COUNT_DELAY_SEC(n) ((n) * (1000000 / WAIT_SLEEP_US))
|
||||
|
||||
/* GPIO pins */
|
||||
#define EPROM_WP_N BIT_ULL(14) /* EPROM write line */
|
||||
|
||||
/*
|
||||
* How long to wait for the EPROM to become available, in ms.
|
||||
* The spec 32 Mb EPROM takes around 40s to erase then write.
|
||||
* Double it for safety.
|
||||
*/
|
||||
#define EPROM_TIMEOUT 80000 /* ms */
|
||||
|
||||
/*
|
||||
* Turn on external enable line that allows writing on the flash.
|
||||
*/
|
||||
static void write_enable(struct hfi1_devdata *dd)
|
||||
{
|
||||
/* raise signal */
|
||||
write_csr(dd, ASIC_GPIO_OUT, read_csr(dd, ASIC_GPIO_OUT) | EPROM_WP_N);
|
||||
/* raise enable */
|
||||
write_csr(dd, ASIC_GPIO_OE, read_csr(dd, ASIC_GPIO_OE) | EPROM_WP_N);
|
||||
}
|
||||
|
||||
/*
|
||||
* Turn off external enable line that allows writing on the flash.
|
||||
*/
|
||||
static void write_disable(struct hfi1_devdata *dd)
|
||||
{
|
||||
/* lower signal */
|
||||
write_csr(dd, ASIC_GPIO_OUT, read_csr(dd, ASIC_GPIO_OUT) & ~EPROM_WP_N);
|
||||
/* lower enable */
|
||||
write_csr(dd, ASIC_GPIO_OE, read_csr(dd, ASIC_GPIO_OE) & ~EPROM_WP_N);
|
||||
}
|
||||
|
||||
/*
|
||||
* Wait for the device to become not busy. Must be called after all
|
||||
* write or erase operations.
|
||||
*/
|
||||
static int wait_for_not_busy(struct hfi1_devdata *dd)
|
||||
{
|
||||
unsigned long count = 0;
|
||||
u64 reg;
|
||||
int ret = 0;
|
||||
|
||||
/* starts page mode */
|
||||
write_csr(dd, ASIC_EEP_ADDR_CMD, CMD_READ_SR1);
|
||||
while (1) {
|
||||
udelay(WAIT_SLEEP_US);
|
||||
usleep_range(WAIT_SLEEP_US - 5, WAIT_SLEEP_US + 5);
|
||||
count++;
|
||||
reg = read_csr(dd, ASIC_EEP_DATA);
|
||||
if ((reg & SR1_BUSY) == 0)
|
||||
break;
|
||||
/* 200s is the largest time for a 128Mb device */
|
||||
if (count > COUNT_DELAY_SEC(200)) {
|
||||
dd_dev_err(dd, "waited too long for SPI FLASH busy to clear - failing\n");
|
||||
ret = -ETIMEDOUT;
|
||||
break; /* break, not goto - must stop page mode */
|
||||
}
|
||||
}
|
||||
|
||||
/* stop page mode with a NOP */
|
||||
write_csr(dd, ASIC_EEP_ADDR_CMD, CMD_NOP);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Read the device ID from the SPI controller.
|
||||
*/
|
||||
static u32 read_device_id(struct hfi1_devdata *dd)
|
||||
{
|
||||
/* read the Manufacture Device ID */
|
||||
write_csr(dd, ASIC_EEP_ADDR_CMD, CMD_READ_MANUF_DEV_ID);
|
||||
return (u32)read_csr(dd, ASIC_EEP_DATA);
|
||||
}
|
||||
|
||||
/*
|
||||
* Erase the whole flash.
|
||||
*/
|
||||
static int erase_chip(struct hfi1_devdata *dd)
|
||||
{
|
||||
int ret;
|
||||
|
||||
write_enable(dd);
|
||||
|
||||
write_csr(dd, ASIC_EEP_ADDR_CMD, CMD_WRITE_ENABLE);
|
||||
write_csr(dd, ASIC_EEP_ADDR_CMD, CMD_CHIP_ERASE);
|
||||
ret = wait_for_not_busy(dd);
|
||||
|
||||
write_disable(dd);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Erase a range.
|
||||
*/
|
||||
static int erase_range(struct hfi1_devdata *dd, u32 start, u32 len)
|
||||
{
|
||||
u32 end = start + len;
|
||||
int ret = 0;
|
||||
|
||||
if (end < start)
|
||||
return -EINVAL;
|
||||
|
||||
/* check the end points for the minimum erase */
|
||||
if ((start & MASK_4KB) || (end & MASK_4KB)) {
|
||||
dd_dev_err(dd,
|
||||
"%s: non-aligned range (0x%x,0x%x) for a 4KB erase\n",
|
||||
__func__, start, end);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
write_enable(dd);
|
||||
|
||||
while (start < end) {
|
||||
write_csr(dd, ASIC_EEP_ADDR_CMD, CMD_WRITE_ENABLE);
|
||||
/* check in order of largest to smallest */
|
||||
if (((start & MASK_64KB) == 0) && (start + SIZE_64KB <= end)) {
|
||||
write_csr(dd, ASIC_EEP_ADDR_CMD,
|
||||
CMD_SECTOR_ERASE_64KB(start));
|
||||
start += SIZE_64KB;
|
||||
} else if (((start & MASK_32KB) == 0) &&
|
||||
(start + SIZE_32KB <= end)) {
|
||||
write_csr(dd, ASIC_EEP_ADDR_CMD,
|
||||
CMD_SECTOR_ERASE_32KB(start));
|
||||
start += SIZE_32KB;
|
||||
} else { /* 4KB will work */
|
||||
write_csr(dd, ASIC_EEP_ADDR_CMD,
|
||||
CMD_SECTOR_ERASE_4KB(start));
|
||||
start += SIZE_4KB;
|
||||
}
|
||||
ret = wait_for_not_busy(dd);
|
||||
if (ret)
|
||||
goto done;
|
||||
}
|
||||
|
||||
done:
|
||||
write_disable(dd);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Read a 256 byte (64 dword) EPROM page.
|
||||
* All callers have verified the offset is at a page boundary.
|
||||
*/
|
||||
static void read_page(struct hfi1_devdata *dd, u32 offset, u32 *result)
|
||||
{
|
||||
int i;
|
||||
|
||||
write_csr(dd, ASIC_EEP_ADDR_CMD, CMD_READ_DATA(offset));
|
||||
for (i = 0; i < EP_PAGE_SIZE / sizeof(u32); i++)
|
||||
result[i] = (u32)read_csr(dd, ASIC_EEP_DATA);
|
||||
write_csr(dd, ASIC_EEP_ADDR_CMD, CMD_NOP); /* close open page */
|
||||
}
|
||||
|
||||
/*
|
||||
* Read length bytes starting at offset. Copy to user address addr.
|
||||
*/
|
||||
static int read_length(struct hfi1_devdata *dd, u32 start, u32 len, u64 addr)
|
||||
{
|
||||
u32 offset;
|
||||
u32 buffer[EP_PAGE_SIZE / sizeof(u32)];
|
||||
int ret = 0;
|
||||
|
||||
/* reject anything not on an EPROM page boundary */
|
||||
if ((start & EEP_PAGE_MASK) || (len & EEP_PAGE_MASK))
|
||||
return -EINVAL;
|
||||
|
||||
for (offset = 0; offset < len; offset += EP_PAGE_SIZE) {
|
||||
read_page(dd, start + offset, buffer);
|
||||
if (copy_to_user((void __user *)(addr + offset),
|
||||
buffer, EP_PAGE_SIZE)) {
|
||||
ret = -EFAULT;
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
|
||||
done:
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Write a 256 byte (64 dword) EPROM page.
|
||||
* All callers have verified the offset is at a page boundary.
|
||||
*/
|
||||
static int write_page(struct hfi1_devdata *dd, u32 offset, u32 *data)
|
||||
{
|
||||
int i;
|
||||
|
||||
write_csr(dd, ASIC_EEP_ADDR_CMD, CMD_WRITE_ENABLE);
|
||||
write_csr(dd, ASIC_EEP_DATA, data[0]);
|
||||
write_csr(dd, ASIC_EEP_ADDR_CMD, CMD_PAGE_PROGRAM(offset));
|
||||
for (i = 1; i < EP_PAGE_SIZE / sizeof(u32); i++)
|
||||
write_csr(dd, ASIC_EEP_DATA, data[i]);
|
||||
/* will close the open page */
|
||||
return wait_for_not_busy(dd);
|
||||
}
|
||||
|
||||
/*
|
||||
* Write length bytes starting at offset. Read from user address addr.
|
||||
*/
|
||||
static int write_length(struct hfi1_devdata *dd, u32 start, u32 len, u64 addr)
|
||||
{
|
||||
u32 offset;
|
||||
u32 buffer[EP_PAGE_SIZE / sizeof(u32)];
|
||||
int ret = 0;
|
||||
|
||||
/* reject anything not on an EPROM page boundary */
|
||||
if ((start & EEP_PAGE_MASK) || (len & EEP_PAGE_MASK))
|
||||
return -EINVAL;
|
||||
|
||||
write_enable(dd);
|
||||
|
||||
for (offset = 0; offset < len; offset += EP_PAGE_SIZE) {
|
||||
if (copy_from_user(buffer, (void __user *)(addr + offset),
|
||||
EP_PAGE_SIZE)) {
|
||||
ret = -EFAULT;
|
||||
goto done;
|
||||
}
|
||||
ret = write_page(dd, start + offset, buffer);
|
||||
if (ret)
|
||||
goto done;
|
||||
}
|
||||
|
||||
done:
|
||||
write_disable(dd);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* convert an range composite to a length, in bytes */
|
||||
static inline u32 extract_rlen(u32 composite)
|
||||
{
|
||||
return (composite & 0xffff) * EP_PAGE_SIZE;
|
||||
}
|
||||
|
||||
/* convert an range composite to a start, in bytes */
|
||||
static inline u32 extract_rstart(u32 composite)
|
||||
{
|
||||
return (composite >> 16) * EP_PAGE_SIZE;
|
||||
}
|
||||
|
||||
/*
|
||||
* Perform the given operation on the EPROM. Called from user space. The
|
||||
* user credentials have already been checked.
|
||||
*
|
||||
* Return 0 on success, -ERRNO on error
|
||||
*/
|
||||
int handle_eprom_command(struct file *fp, const struct hfi1_cmd *cmd)
|
||||
{
|
||||
struct hfi1_devdata *dd;
|
||||
u32 dev_id;
|
||||
u32 rlen; /* range length */
|
||||
u32 rstart; /* range start */
|
||||
int i_minor;
|
||||
int ret = 0;
|
||||
|
||||
/*
|
||||
* Map the device file to device data using the relative minor.
|
||||
* The device file minor number is the unit number + 1. 0 is
|
||||
* the generic device file - reject it.
|
||||
*/
|
||||
i_minor = iminor(file_inode(fp)) - HFI1_USER_MINOR_BASE;
|
||||
if (i_minor <= 0)
|
||||
return -EINVAL;
|
||||
dd = hfi1_lookup(i_minor - 1);
|
||||
if (!dd) {
|
||||
pr_err("%s: cannot find unit %d!\n", __func__, i_minor);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* some devices do not have an EPROM */
|
||||
if (!dd->eprom_available)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
ret = acquire_chip_resource(dd, CR_EPROM, EPROM_TIMEOUT);
|
||||
if (ret) {
|
||||
dd_dev_err(dd, "%s: unable to acquire EPROM resource\n",
|
||||
__func__);
|
||||
goto done_asic;
|
||||
}
|
||||
|
||||
dd_dev_info(dd, "%s: cmd: type %d, len 0x%x, addr 0x%016llx\n",
|
||||
__func__, cmd->type, cmd->len, cmd->addr);
|
||||
|
||||
switch (cmd->type) {
|
||||
case HFI1_CMD_EP_INFO:
|
||||
if (cmd->len != sizeof(u32)) {
|
||||
ret = -ERANGE;
|
||||
break;
|
||||
}
|
||||
dev_id = read_device_id(dd);
|
||||
/* addr points to a u32 user buffer */
|
||||
if (copy_to_user((void __user *)cmd->addr, &dev_id,
|
||||
sizeof(u32)))
|
||||
ret = -EFAULT;
|
||||
break;
|
||||
|
||||
case HFI1_CMD_EP_ERASE_CHIP:
|
||||
ret = erase_chip(dd);
|
||||
break;
|
||||
|
||||
case HFI1_CMD_EP_ERASE_RANGE:
|
||||
rlen = extract_rlen(cmd->len);
|
||||
rstart = extract_rstart(cmd->len);
|
||||
ret = erase_range(dd, rstart, rlen);
|
||||
break;
|
||||
|
||||
case HFI1_CMD_EP_READ_RANGE:
|
||||
rlen = extract_rlen(cmd->len);
|
||||
rstart = extract_rstart(cmd->len);
|
||||
ret = read_length(dd, rstart, rlen, cmd->addr);
|
||||
break;
|
||||
|
||||
case HFI1_CMD_EP_WRITE_RANGE:
|
||||
rlen = extract_rlen(cmd->len);
|
||||
rstart = extract_rstart(cmd->len);
|
||||
ret = write_length(dd, rstart, rlen, cmd->addr);
|
||||
break;
|
||||
|
||||
default:
|
||||
dd_dev_err(dd, "%s: unexpected command %d\n",
|
||||
__func__, cmd->type);
|
||||
ret = -EINVAL;
|
||||
break;
|
||||
}
|
||||
|
||||
release_chip_resource(dd, CR_EPROM);
|
||||
done_asic:
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Initialize the EPROM handler.
|
||||
*/
|
||||
|
|
|
@ -189,7 +189,6 @@ static ssize_t hfi1_file_write(struct file *fp, const char __user *data,
|
|||
void *dest = NULL;
|
||||
__u64 user_val = 0;
|
||||
int uctxt_required = 1;
|
||||
int must_be_root = 0;
|
||||
|
||||
/* FIXME: This interface cannot continue out of staging */
|
||||
if (WARN_ON_ONCE(!ib_safe_file_access(fp)))
|
||||
|
@ -234,15 +233,6 @@ static ssize_t hfi1_file_write(struct file *fp, const char __user *data,
|
|||
copy = 0;
|
||||
user_val = cmd.addr;
|
||||
break;
|
||||
case HFI1_CMD_EP_INFO:
|
||||
case HFI1_CMD_EP_ERASE_CHIP:
|
||||
case HFI1_CMD_EP_ERASE_RANGE:
|
||||
case HFI1_CMD_EP_READ_RANGE:
|
||||
case HFI1_CMD_EP_WRITE_RANGE:
|
||||
uctxt_required = 0; /* assigned user context not required */
|
||||
must_be_root = 1; /* validate user */
|
||||
copy = 0;
|
||||
break;
|
||||
default:
|
||||
ret = -EINVAL;
|
||||
goto bail;
|
||||
|
@ -265,12 +255,6 @@ static ssize_t hfi1_file_write(struct file *fp, const char __user *data,
|
|||
goto bail;
|
||||
}
|
||||
|
||||
/* only root can do these operations */
|
||||
if (must_be_root && !capable(CAP_SYS_ADMIN)) {
|
||||
ret = -EPERM;
|
||||
goto bail;
|
||||
}
|
||||
|
||||
switch (cmd.type) {
|
||||
case HFI1_CMD_ASSIGN_CTXT:
|
||||
ret = assign_ctxt(fp, &uinfo);
|
||||
|
@ -409,13 +393,6 @@ static ssize_t hfi1_file_write(struct file *fp, const char __user *data,
|
|||
sc_return_credits(sc);
|
||||
break;
|
||||
}
|
||||
case HFI1_CMD_EP_INFO:
|
||||
case HFI1_CMD_EP_ERASE_CHIP:
|
||||
case HFI1_CMD_EP_ERASE_RANGE:
|
||||
case HFI1_CMD_EP_READ_RANGE:
|
||||
case HFI1_CMD_EP_WRITE_RANGE:
|
||||
ret = handle_eprom_command(fp, &cmd);
|
||||
break;
|
||||
}
|
||||
|
||||
if (ret >= 0)
|
||||
|
|
|
@ -122,13 +122,6 @@
|
|||
#define HFI1_CMD_SET_PKEY 11 /* set context's pkey */
|
||||
#define HFI1_CMD_CTXT_RESET 12 /* reset context's HW send context */
|
||||
#define HFI1_CMD_TID_INVAL_READ 13 /* read TID cache invalidations */
|
||||
/* separate EPROM commands from normal PSM commands */
|
||||
#define HFI1_CMD_EP_INFO 64 /* read EPROM device ID */
|
||||
#define HFI1_CMD_EP_ERASE_CHIP 65 /* erase whole EPROM */
|
||||
/* range 66-74 no longer used */
|
||||
#define HFI1_CMD_EP_ERASE_RANGE 75 /* erase EPROM range */
|
||||
#define HFI1_CMD_EP_READ_RANGE 76 /* read EPROM range */
|
||||
#define HFI1_CMD_EP_WRITE_RANGE 77 /* write EPROM range */
|
||||
|
||||
#define _HFI1_EVENT_FROZEN_BIT 0
|
||||
#define _HFI1_EVENT_LINKDOWN_BIT 1
|
||||
|
|
Loading…
Reference in New Issue