Skip to content

S
svec-sw
Commit c43daaa4 authored by Luis Fernando Ruiz's avatar Luis Fernando Ruiz
Browse files
Options

More message cleaning

parent 1c0ff4fb
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 39 deletions
kernel/svec-fmc.c
View file @ c43daaa4
...@@ -27,8 +27,6 @@ static uint32_t svec_readl(struct fmc_device *fmc, int offset) ...@@ -27,8 +27,6 @@ static uint32_t svec_readl(struct fmc_device *fmc, int offset)
val = ioread32be(fmc->base + offset); val = ioread32be(fmc->base + offset);
/*printk(KERN_ERR "%s: [0x%p]: 0x%x\n", __func__, fmc->base + offset, val);*/
return val; return val;
} }
...@@ -37,7 +35,6 @@ static void svec_writel(struct fmc_device *fmc, uint32_t val, int offset) ...@@ -37,7 +35,6 @@ static void svec_writel(struct fmc_device *fmc, uint32_t val, int offset)
iowrite32be(val, fmc->base + offset); iowrite32be(val, fmc->base + offset);
} }
static int svec_reprogram(struct fmc_device *fmc, struct fmc_driver *drv, static int svec_reprogram(struct fmc_device *fmc, struct fmc_driver *drv,
char *gw) char *gw)
{ {
...@@ -51,6 +48,7 @@ static int svec_reprogram(struct fmc_device *fmc, struct fmc_driver *drv, ...@@ -51,6 +48,7 @@ static int svec_reprogram(struct fmc_device *fmc, struct fmc_driver *drv,
return ret; return ret;
} }
if (!gw) if (!gw)
gw = svec_fw_name; gw = svec_fw_name;
...@@ -95,7 +93,8 @@ static int svec_reprogram(struct fmc_device *fmc, struct fmc_driver *drv, ...@@ -95,7 +93,8 @@ static int svec_reprogram(struct fmc_device *fmc, struct fmc_driver *drv,
svec->already_reprogrammed = 1; svec->already_reprogrammed = 1;
out: out:
release_firmware(fw); release_firmware(fw);
pr_err("svec-fmc: svec reprogram failed while loading %s\n", gw); if (ret < 0)
pr_err("svec-fmc: svec reprogram failed while loading %s\n", gw);
return ret; return ret;
} }
......
kernel/svec_drv.c
View file @ c43daaa4
...@@ -66,15 +66,16 @@ int map_window( struct svec_dev *svec, ...@@ -66,15 +66,16 @@ int map_window( struct svec_dev *svec,
unsigned long base, unsigned long base,
unsigned int size) unsigned int size)
{ {
struct device *dev = svec->dev;
int rval; int rval;
if (svec->map[win] != NULL) { if (svec->map[win] != NULL) {
pr_err("svec: Window %d already mapped\n", (int)win); dev_err(dev, "Window %d already mapped\n", (int)win);
return -EPERM; return -EPERM;
} }
svec->map[win] = kzalloc(sizeof(struct vme_mapping), GFP_KERNEL); svec->map[win] = kzalloc(sizeof(struct vme_mapping), GFP_KERNEL);
if (!svec->map[win]) { if (!svec->map[win]) {
pr_err("svec: Cannot allocate memory for vme_mapping struct\n"); dev_err(dev, "Cannot allocate memory for vme_mapping struct\n");
return -ENOMEM; return -ENOMEM;
} }
...@@ -87,7 +88,7 @@ int map_window( struct svec_dev *svec, ...@@ -87,7 +88,7 @@ int map_window( struct svec_dev *svec,
svec->map[win]->sizel = size; svec->map[win]->sizel = size;
if (( rval = vme_find_mapping(svec->map[win], 1)) != 0) { if (( rval = vme_find_mapping(svec->map[win], 1)) != 0) {
pr_err("svec: Failed to map window %d: (%d)\n", (int)win, rval); dev_err(dev, "Failed to map window %d: (%d)\n", (int)win, rval);
return -EINVAL; return -EINVAL;
} }
...@@ -99,14 +100,14 @@ int unmap_window(struct svec_dev *svec, enum svec_map_win win) ...@@ -99,14 +100,14 @@ int unmap_window(struct svec_dev *svec, enum svec_map_win win)
struct device *dev = svec->dev; struct device *dev = svec->dev;
if (svec->map[win] == NULL) { if (svec->map[win] == NULL) {
pr_err("svec: Window %d not mapped. Cannot unmap\n", (int)win); dev_err(dev, "Window %d not mapped. Cannot unmap\n", (int)win);
return -EINVAL; return -EINVAL;
} }
if (vme_release_mapping(svec->map[win], 1)) { if (vme_release_mapping(svec->map[win], 1)) {
pr_err("svec: Unmap for window %d failed\n", (int)win); dev_err(dev, "Unmap for window %d failed\n", (int)win);
return -EINVAL; return -EINVAL;
} }
dev_info(dev, "svec: Window %d unmaped\n", (int)win); dev_info(dev, "Window %d unmaped\n", (int)win);
kfree(svec->map[win]); kfree(svec->map[win]);
svec->map[win] = NULL; svec->map[win] = NULL;
return 0; return 0;
...@@ -121,7 +122,7 @@ int svec_bootloader_unlock (struct svec_dev *svec) ...@@ -121,7 +122,7 @@ int svec_bootloader_unlock (struct svec_dev *svec)
/* Check if CS/CSR window is mapped */ /* Check if CS/CSR window is mapped */
if (svec->map[MAP_CR_CSR] == NULL) { if (svec->map[MAP_CR_CSR] == NULL) {
pr_err("svec: CS/CSR window not found\n"); dev_err(dev, "CS/CSR window not found\n");
return -EINVAL; return -EINVAL;
} }
...@@ -131,7 +132,7 @@ int svec_bootloader_unlock (struct svec_dev *svec) ...@@ -131,7 +132,7 @@ int svec_bootloader_unlock (struct svec_dev *svec)
for (i=0; i<8; i++) for (i=0; i<8; i++)
iowrite32(cpu_to_be32(boot_seq[i]), addr); iowrite32(cpu_to_be32(boot_seq[i]), addr);
dev_info(dev, "svec: Wrote unlock sequence at %x\n", (unsigned int)addr); dev_info(dev, "Wrote unlock sequence at %x\n", (unsigned int)addr);
return 0; return 0;
} }
...@@ -145,7 +146,7 @@ int svec_bootloader_is_active(struct svec_dev *svec) ...@@ -145,7 +146,7 @@ int svec_bootloader_is_active(struct svec_dev *svec)
/* Check if CS/CSR window is mapped */ /* Check if CS/CSR window is mapped */
if (svec->map[MAP_CR_CSR] == NULL) { if (svec->map[MAP_CR_CSR] == NULL) {
pr_err("svec: CS/CSR window not found\n"); dev_err(dev, "CS/CSR window not found\n");
return -EINVAL; return -EINVAL;
} }
...@@ -155,11 +156,11 @@ int svec_bootloader_is_active(struct svec_dev *svec) ...@@ -155,11 +156,11 @@ int svec_bootloader_is_active(struct svec_dev *svec)
idc = htonl(idc); idc = htonl(idc);
if (strncmp(buf, "SVEC", 4) == 0) { if (strncmp(buf, "SVEC", 4) == 0) {
dev_info(dev, "svec: IDCode value %x [%s].\n", idc, buf); dev_info(dev, "IDCode value %x [%s].\n", idc, buf);
/* Bootloader active. Unlocked */ /* Bootloader active. Unlocked */
return 1; return 1;
} else } else
dev_info(dev, "svec: IDCode value %x.\n", idc); dev_info(dev, "IDCode value %x.\n", idc);
/* Bootloader not active. Locked */ /* Bootloader not active. Locked */
return 0; return 0;
...@@ -228,6 +229,7 @@ void setup_csr_fa0(void *base, u32 vme, unsigned vector, unsigned level) ...@@ -228,6 +229,7 @@ void setup_csr_fa0(void *base, u32 vme, unsigned vector, unsigned level)
int svec_load_fpga(struct svec_dev *svec, const void *blob, int size) int svec_load_fpga(struct svec_dev *svec, const void *blob, int size)
{ {
struct device *dev = svec->dev;
const uint32_t *data = blob; const uint32_t *data = blob;
void *loader_addr; /* FPGA loader virtual address */ void *loader_addr; /* FPGA loader virtual address */
uint32_t n; uint32_t n;
...@@ -239,25 +241,25 @@ int svec_load_fpga(struct svec_dev *svec, const void *blob, int size) ...@@ -239,25 +241,25 @@ int svec_load_fpga(struct svec_dev *svec, const void *blob, int size)
/* Check if we have something to do... */ /* Check if we have something to do... */
if ((data == NULL) || (size == 0)){ if ((data == NULL) || (size == 0)){
printk(KERN_ERR PFX "%s: data to be load is NULL\n", __func__); dev_err(dev, "%s: data to be load is NULL\n", __func__);
return -EINVAL; return -EINVAL;
} }
/* Check if CS/CSR window is mapped */ /* Check if CS/CSR window is mapped */
if (svec->map[MAP_CR_CSR] == NULL) { if (svec->map[MAP_CR_CSR] == NULL) {
printk(KERN_ERR PFX "CS/CSR window not found\n"); dev_err(dev, "CS/CSR window not found\n");
return -EINVAL; return -EINVAL;
} }
/* Unlock (activate) bootloader */ /* Unlock (activate) bootloader */
if (svec_bootloader_unlock(svec)) { if (svec_bootloader_unlock(svec)) {
printk(KERN_ERR PFX "Bootloader unlock failed\n"); dev_err(dev, "Bootloader unlock failed\n");
return -EINVAL; return -EINVAL;
} }
/* Check if bootloader is active */ /* Check if bootloader is active */
if (!svec_bootloader_is_active(svec)) { if (!svec_bootloader_is_active(svec)) {
printk(KERN_ERR PFX "Bootloader locked after unlock!\n"); dev_err(dev, "Bootloader locked after unlock!\n");
return -EINVAL; return -EINVAL;
} }
...@@ -286,7 +288,7 @@ int svec_load_fpga(struct svec_dev *svec, const void *blob, int size) ...@@ -286,7 +288,7 @@ int svec_load_fpga(struct svec_dev *svec, const void *blob, int size)
rval = be32_to_cpu(ioread32(loader_addr + XLDR_REG_CSR)); rval = be32_to_cpu(ioread32(loader_addr + XLDR_REG_CSR));
if(rval & XLDR_CSR_DONE) { if(rval & XLDR_CSR_DONE) {
err = rval & XLDR_CSR_ERROR ? -EINVAL : 0; err = rval & XLDR_CSR_ERROR ? -EINVAL : 0;
printk(KERN_ERR PFX "Bitstream loaded, status: %s\n", dev_err(dev, "Bitstream loaded, status: %s\n",
(err < 0 ? "ERROR" : "OK")); (err < 0 ? "ERROR" : "OK"));
/* give the VME bus control to App FPGA */ /* give the VME bus control to App FPGA */
...@@ -304,7 +306,7 @@ static int __devexit svec_remove(struct device *pdev, unsigned int ndev) ...@@ -304,7 +306,7 @@ static int __devexit svec_remove(struct device *pdev, unsigned int ndev)
struct svec_dev *svec = dev_get_drvdata(pdev); struct svec_dev *svec = dev_get_drvdata(pdev);
int i; int i;
printk(KERN_ERR PFX "%s\n", __func__); pr_debug("%s\n", __func__);
for (i=0; i<2; i++) { for (i=0; i<2; i++) {
if (svec->fmc[i] != NULL) if (svec->fmc[i] != NULL)
...@@ -336,20 +338,18 @@ int svec_load_fpga_file(struct svec_dev *svec, const char *name) ...@@ -336,20 +338,18 @@ int svec_load_fpga_file(struct svec_dev *svec, const char *name)
const struct firmware *fw; const struct firmware *fw;
int err = 0; int err = 0;
dev_info(dev, "%s: file %s\n", __func__, name);
if (name == NULL) { if (name == NULL) {
pr_err("svec: %s. File name is NULL\n", __func__); dev_err(dev, "%s. File name is NULL\n", __func__);
} }
err = request_firmware(&fw, name, dev); err = request_firmware(&fw, name, dev);
if (err < 0) { if (err < 0) {
dev_err(dev, "svec: Request firmware \"%s\": error %i\n", dev_err(dev, "Request firmware \"%s\": error %i\n",
name, err); name, err);
return err; return err;
} }
dev_info(dev, "svec: Got file \"%s\", %i (0x%x) bytes\n", dev_info(dev, "Got file \"%s\", %i (0x%x) bytes\n",
name, fw->size, fw->size); name, fw->size, fw->size);
err = svec_load_fpga(svec, (uint32_t *)fw->data, fw->size); err = svec_load_fpga(svec, (uint32_t *)fw->data, fw->size);
...@@ -366,17 +366,17 @@ static int __devinit svec_probe(struct device *pdev, unsigned int ndev) ...@@ -366,17 +366,17 @@ static int __devinit svec_probe(struct device *pdev, unsigned int ndev)
int i; int i;
int error = 0; int error = 0;
pr_debug("Probe for device %02d\n", ndev);
if (lun[ndev] >= SVEC_MAX_DEVICES) { if (lun[ndev] >= SVEC_MAX_DEVICES) {
pr_err("Card lun %d out of range [0..%d]\n", dev_err(pdev, "Card lun %d out of range [0..%d]\n",
lun[ndev], SVEC_MAX_DEVICES -1); lun[ndev], SVEC_MAX_DEVICES -1);
return -EINVAL; return -EINVAL;
} }
printk (KERN_ERR PFX "probe for device %02d\n", ndev);
svec = kzalloc(sizeof(*svec), GFP_KERNEL); svec = kzalloc(sizeof(*svec), GFP_KERNEL);
if (svec == NULL) { if (svec == NULL) {
printk(KERN_ERR PFX "Cannot allocate memory for svec card struct\n"); dev_err(pdev, "Cannot allocate memory for svec card struct\n");
return -ENOMEM; return -ENOMEM;
} }
...@@ -397,11 +397,11 @@ static int __devinit svec_probe(struct device *pdev, unsigned int ndev) ...@@ -397,11 +397,11 @@ static int __devinit svec_probe(struct device *pdev, unsigned int ndev)
error = map_window(svec, MAP_CR_CSR, VME_CR_CSR, error = map_window(svec, MAP_CR_CSR, VME_CR_CSR,
VME_D32, svec->vmebase1, 0x80000); VME_D32, svec->vmebase1, 0x80000);
if (error) { if (error) {
printk(KERN_ERR PFX "error mapping CR/CSR space\n"); dev_err(pdev, "Error mapping CR/CSR space\n");
goto failed; goto failed;
} }
printk(KERN_ERR PFX "CR/CSR mapping successful at 0x%p\n", pr_debug("CR/CSR mapping successful at 0x%p\n",
svec->map[MAP_CR_CSR]->kernel_va); svec->map[MAP_CR_CSR]->kernel_va);
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
name = pdev->bus_id; name = pdev->bus_id;
...@@ -413,7 +413,7 @@ static int __devinit svec_probe(struct device *pdev, unsigned int ndev) ...@@ -413,7 +413,7 @@ static int __devinit svec_probe(struct device *pdev, unsigned int ndev)
"SVEC at VME-A32 0x%08lx - 0x%08lx irqv %d irql %d", "SVEC at VME-A32 0x%08lx - 0x%08lx irqv %d irql %d",
svec->vmebase1, svec->vmebase2, vector[ndev], level[ndev]); svec->vmebase1, svec->vmebase2, vector[ndev], level[ndev]);
printk (KERN_ERR PFX "%s\n", svec->description); dev_info(pdev, "%s\n", svec->description);
/*Create cdev, just to know the carrier is there */ /*Create cdev, just to know the carrier is there */
devno = MKDEV(MAJOR(svec_devno), ndev); devno = MKDEV(MAJOR(svec_devno), ndev);
...@@ -429,7 +429,7 @@ static int __devinit svec_probe(struct device *pdev, unsigned int ndev) ...@@ -429,7 +429,7 @@ static int __devinit svec_probe(struct device *pdev, unsigned int ndev)
dev_set_drvdata(svec->dev, svec); dev_set_drvdata(svec->dev, svec);
error = svec_create_sysfs_files(svec); error = svec_create_sysfs_files(svec);
if (error) { if (error) {
printk(KERN_ERR PFX "Error creating sysfs files\n"); dev_err(pdev, "Error creating sysfs files\n");
goto failed; goto failed;
} }
...@@ -446,20 +446,20 @@ static int __devinit svec_probe(struct device *pdev, unsigned int ndev) ...@@ -446,20 +446,20 @@ static int __devinit svec_probe(struct device *pdev, unsigned int ndev)
error = map_window(svec, MAP_REG, VME_A32_USER_DATA_SCT, error = map_window(svec, MAP_REG, VME_A32_USER_DATA_SCT,
VME_D32, svec->vmebase2, 0x100000); VME_D32, svec->vmebase2, 0x100000);
if (error) { if (error) {
printk(KERN_ERR PFX "error mapping CR/CSR space\n"); dev_err(pdev, "error mapping CR/CSR space\n");
goto failed; goto failed;
} }
printk(KERN_ERR PFX "A32 mapping successful at 0x%p\n", dev_info(pdev, "A32 mapping successful at 0x%p\n",
svec->map[MAP_REG]->kernel_va); svec->map[MAP_REG]->kernel_va);
/* fmc devices creation */ /* fmc devices creation */
for (i=0; i<2; i++) { for (i=0; i<2; i++) {
printk(KERN_ERR "creating fmc device for mezzanine #%d...\n", i+1); dev_err(pdev, "Creating fmc device for mezzanine #%d...\n", i+1);
error = svec_fmc_create(svec, i); error = svec_fmc_create(svec, i);
if (error) if (error)
goto failed_unmap; goto failed_unmap;
else else
printk(KERN_ERR "fmc device created for mezzanine #%d\n", i+1); dev_info(pdev, "fmc device created for mezzanine #%d\n", i+1);
} }
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment