Skip to content

Fix hm2 spi #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 6, 2019
Merged

Fix hm2 spi #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62ae06b
HM2_Bspi: hm2_bspi_write_chan(): add missing tranfer buffer value
the-snowwhite May 27, 2019
04e768d
hm2_bspi: rename sense-inverted parameters in source
the-snowwhite May 27, 2019
3ea9920
hm2_bspi: add support for samplelate parameter is bspi channel descri…
the-snowwhite May 28, 2019
c72df55
hostmot2: Add dbspi (buffered spi with decoded CS_n ) support
the-snowwhite May 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,6 +1078,7 @@ hostmot2-objs += \
hal/drivers/mesa-hostmot2/sserial.o \
hal/drivers/mesa-hostmot2/stepgen.o \
hal/drivers/mesa-hostmot2/bspi.o \
hal/drivers/mesa-hostmot2/dbspi.o \
hal/drivers/mesa-hostmot2/uart.o \
hal/drivers/mesa-hostmot2/pktuart.o \
hal/drivers/mesa-hostmot2/watchdog.o \
Expand Down
87 changes: 44 additions & 43 deletions src/hal/drivers/mesa-hostmot2/bspi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,24 @@
#include "hal.h"
#include "hostmot2.h"

int hm2_bspi_parse_md(hostmot2_t *hm2, int md_index)
int hm2_bspi_parse_md(hostmot2_t *hm2, int md_index)
{
// All this function actually does is allocate memory
// and give the bspi modules names.
//
// and give the bspi modules names.


//
// some standard sanity checks
//

int i, j, r = -EINVAL;
hm2_module_descriptor_t *md = &hm2->md[md_index];

if (!hm2_md_is_consistent_or_complain(hm2, md_index, 0, 3, 0x40, 0x0007)) {
HM2_ERR("inconsistent Module Descriptor!\n");
return -EINVAL;
}

if (hm2->bspi.num_instances != 0) {
HM2_ERR(
"found duplicate Module Descriptor for %s (inconsistent "
Expand All @@ -51,7 +51,7 @@ int hm2_bspi_parse_md(hostmot2_t *hm2, int md_index)
);
return -EINVAL;
}

if (hm2->config.num_bspis > md->instances) {
HM2_ERR(
"config defines %d bspis, but only %d are available, "
Expand All @@ -61,29 +61,29 @@ int hm2_bspi_parse_md(hostmot2_t *hm2, int md_index)
);
return -EINVAL;
}

if (hm2->config.num_bspis == 0) {
return 0;
}
//

//
// looks good, start initializing
//
//

if (hm2->config.num_bspis == -1) {
hm2->bspi.num_instances = md->instances;
} else {
hm2->bspi.num_instances = hm2->config.num_bspis;
}
hm2->bspi.instance = (hm2_bspi_instance_t *)hal_malloc(hm2->bspi.num_instances

hm2->bspi.instance = (hm2_bspi_instance_t *)hal_malloc(hm2->bspi.num_instances
* sizeof(hm2_bspi_instance_t));
if (hm2->bspi.instance == NULL) {
HM2_ERR("out of memory!\n");
r = -ENOMEM;
goto fail0;
}

for (i = 0 ; i < hm2->bspi.num_instances ; i++){
hm2_bspi_instance_t *chan = &hm2->bspi.instance[i];
chan->clock_freq = md->clock_freq;
Expand All @@ -97,7 +97,7 @@ int hm2_bspi_parse_md(hostmot2_t *hm2, int md_index)
for (j = 0 ; j < 16 ; j++ ){
chan->addr[j] = chan->base_address + j * sizeof(u32);
}

}
return hm2->bspi.num_instances;
fail0:
Expand All @@ -117,7 +117,7 @@ void hm2_bspi_force_write(hostmot2_t *hm2)
}

EXPORT_SYMBOL_GPL(hm2_tram_add_bspi_frame);
int hm2_tram_add_bspi_frame(char *name, int chan, u32 **wbuff, u32 **rbuff)
int hm2_tram_add_bspi_frame(char *name, int chan, u32 **wbuff, u32 **rbuff)
{
hostmot2_t *hm2;
int i, r;
Expand All @@ -127,7 +127,7 @@ int hm2_tram_add_bspi_frame(char *name, int chan, u32 **wbuff, u32 **rbuff)
return -1;
}
if (hm2->bspi.instance[i].conf_flag[chan] != true){
HM2_ERR("The selected write channel (%i) on bspi instance %s.\n"
HM2_ERR("The selected write channel (%i) on bspi instance %s.\n"
"Has not been configured.\n", chan, name);
return -1;
}
Expand All @@ -140,7 +140,7 @@ int hm2_tram_add_bspi_frame(char *name, int chan, u32 **wbuff, u32 **rbuff)
} else {
HM2_ERR("SPI frame must have a write entry for channel (%i) on %s.\n", chan, name);
return -1;
}
}
if (rbuff != NULL){
// Don't add a read entry for a no-echo channel
if(!(hm2->bspi.instance[i].cd[chan] & 0x80000000)) {
Expand All @@ -151,7 +151,7 @@ int hm2_tram_add_bspi_frame(char *name, int chan, u32 **wbuff, u32 **rbuff)
}
}
}

return 0;
}

Expand All @@ -170,37 +170,37 @@ int hm2_allocate_bspi_tram(char* name)
HM2_ERR("Failed to register TRAM for BSPI %s\n", name);
return -1;
}

return 0;
}

EXPORT_SYMBOL_GPL(hm2_bspi_write_chan);
int hm2_bspi_write_chan(char* name, int chan, u32 val)
{
hostmot2_t *hm2;
u32 buff;
u32 buff = val;
int i, r;
i = hm2_get_bspi(&hm2, name);
if (i < 0){
HM2_ERR_NO_LL("Can not find BSPI instance %s.\n", name);
return -1;
}
if (hm2->bspi.instance[i].conf_flag[chan] != true){
HM2_ERR("The selected write channel (%i) on bspi instance %s.\n"
HM2_ERR("The selected write channel (%i) on bspi instance %s.\n"
"Has not been configured.\n", chan, name);
return -1;
}
r = hm2->llio->write(hm2->llio, hm2->bspi.instance[i].addr[chan], &buff, sizeof(u32));
if (r < 0) {
HM2_ERR("BSPI: hm2->llio->write failure %s\n", name);
}

return r;
}

EXPORT_SYMBOL_GPL(hm2_bspi_setup_chan);
int hm2_bspi_setup_chan(char *name, int chan, int cs, int bits, float mhz,
int delay, int cpol, int cpha, int clear, int echo)
int delay, int cpol, int cpha, int noclear, int noecho, int samplelate)
{
hostmot2_t *hm2;
u32 buff;
Expand All @@ -212,7 +212,7 @@ int hm2_bspi_setup_chan(char *name, int chan, int cs, int bits, float mhz,
return -1;
}
if (chan<0 || chan > 15){
HM2_ERR("BSPI %s: Channel number (%i) is out of range, BSPI only"
HM2_ERR("BSPI %s: Channel number (%i) is out of range, BSPI only"
"supports channels 0-15\n", name, chan);
return -1;
}
Expand All @@ -232,20 +232,21 @@ int hm2_bspi_setup_chan(char *name, int chan, int cs, int bits, float mhz,
return -1;
}
board_mhz = hm2->bspi.instance[i].clock_freq / 1e6;

// reduce clock rate of the FPGA isn't fast enough
if (mhz > board_mhz/2){
mhz=board_mhz/2;
}

buff = (echo != 0) << 31
| (clear != 0) << 30
buff = (noecho != 0) << 31
| (noclear != 0) << 30
| (samplelate != 0) << 29
| ((delay <= 0)? 0x10 : (u32)((delay*board_mhz/1000.0)-1) & 0x1f) << 24
| (cs & 0xF) << 16
| (((u16)(board_mhz / (mhz * 2) - 1) & 0xF)) << 8
| (((u16)(board_mhz / (mhz * 2) - 1) & 0xFF)) << 8
| (cpha != 0) << 7
| (cpol != 0) << 6
| (((u16)(bits - 1)) & 0x1F);
| (((u16)(bits - 1)) & 0x3F);
HM2_DBG("BSPI %s Channel %i setup %x\n", name, chan, buff);
hm2->bspi.instance[i].cd[chan] = buff;
hm2->bspi.instance[i].conf_flag[chan] = true;
Expand All @@ -260,15 +261,15 @@ void hm2_bspi_print_module(hostmot2_t *hm2){
HM2_PRINT(" version: %d\n", hm2->bspi.version);
HM2_PRINT(" channel configurations\n");
for (i = 0; i < hm2->bspi.num_instances; i ++) {
HM2_PRINT(" clock_frequency: %d Hz (%s MHz)\n",
hm2->bspi.instance[i].clock_freq,
HM2_PRINT(" clock_frequency: %d Hz (%s MHz)\n",
hm2->bspi.instance[i].clock_freq,
hm2_hz_to_mhz(hm2->bspi.instance[i].clock_freq));
HM2_PRINT(" instance %d:\n", i);
HM2_PRINT(" HAL name = %s\n", hm2->bspi.instance[i].name);
for (j = 0; j < 16 ; j++){
HM2_PRINT(" frame %i config = %08x\n", j,
HM2_PRINT(" frame %i config = %08x\n", j,
hm2->bspi.instance[i].cd[j]);
HM2_PRINT(" address = %08x\n",
HM2_PRINT(" address = %08x\n",
hm2->bspi.instance[i].addr[j]);
}
}
Expand All @@ -283,12 +284,12 @@ int hm2_bspi_set_read_function(char *name, int (*func)(void *subdata), void *sub
HM2_ERR_NO_LL("Can not find BSPI instance %s.\n", name);
return -1;
}
if (func == NULL) {
if (func == NULL) {
HM2_ERR("Invalid function pointer passed to "
"hm2_bspi_set_read_function.\n");
return -1;
}
if (subdata == NULL) {
if (subdata == NULL) {
HM2_ERR("Invalid data pointer passed to "
"hm2_bspi_set_read_function.\n");
return -1;
Expand All @@ -307,12 +308,12 @@ int hm2_bspi_set_write_function(char *name, int (*func)(void *subdata), void *su
HM2_ERR_NO_LL("Can not find BSPI instance %s.\n", name);
return -1;
}
if (func == NULL) {
if (func == NULL) {
HM2_ERR("Invalid function pointer passed to "
"hm2_bspi_set_write_function.\n");
return -1;
}
if (subdata == NULL) {
if (subdata == NULL) {
HM2_ERR("Invalid data pointer passed to "
"hm2_bspi_set_write_function.\n");
return -1;
Expand All @@ -322,7 +323,7 @@ int hm2_bspi_set_write_function(char *name, int (*func)(void *subdata), void *su
return 0;
}


void hm2_bspi_process_tram_read(hostmot2_t *hm2, long period)
{
int i, r;
Expand Down Expand Up @@ -353,7 +354,7 @@ void hm2_bspi_prepare_tram_write(hostmot2_t *hm2, long period)
}
}

// The following standard Hostmot2 functions are not currently used by bspi.
// The following standard Hostmot2 functions are not currently used by bspi.

void hm2_bspi_cleanup(hostmot2_t *hm2)
{
Expand Down
Loading