drivers/fsi: Add hub master support
PATCH v3 1/1 drivers/fsi: Add hub master support
Scan for links off of the mFSI master on CFAM. Add any devices detected to the existing list of FSI devices and notify any clients.
---
v3 - Squash all patches in series related to hub master into one
patch.
- fsi_slave_scan refactor if/else to switch on type
- Add device for hub master dev field
- Update method of setting master->n_links for hub
v2 - Refactor hub master structures, hub no longer a slave engine
- Add description of what a hub master is and how it differs from a cascaded master
--- drivers/fsi/fsi-core.c | 215 +++++++++++++++++++++++++++++++++++++++++++++-- drivers/fsi/fsi-master.h | 57 +++++++++++++ 2 files changed, 267 insertions(+), 5 deletions(-)
drivers/fsi/fsi-core.c +210 -5
@@ -20,12 +20,14 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/jiffies.h> +#include <linux/delay.h> #include "fsi-master.h" #define DEBUG #define FSI_N_SLAVES 4 +#define FSI_BREAK 0xc0de0000#define FSI_SLAVE_CONF_NEXT_MASK 0x80000000#define FSI_SLAVE_CONF_SLOTS_MASK 0x00ff0000
@@ -43,9 +45,16 @@#define FSI_IPOLL_PERIOD msecs_to_jiffies(fsi_ipoll_period_ms) +#define FSI_ENGID_HUB_MASTER 0x1c +#define FSI_ENGID_HUB_LINK 0x1d +#define FSI_HUB_LINK_OFFSET 0x80000 +#define FSI_MASTER_HUB_LINK_SIZE 0x80000 +#define FSI_HUB_MASTER_MAX_LINKS 8 +static const int engine_page_size =0x400 ;static struct task_struct *master_ipoll;static unsigned int fsi_ipoll_period_ms =100 ; +struct class *hub_master_class;static DEFINE_IDA (master_ida);
@@ -58,6 +67,15 @@ struct fsi_slave {uint8_t id; }; +struct fsi_master_hub { +struct fsi_master master; +struct fsi_slave *slave; +uint32_t control_regs;/* slave-relative addr regs */ +uint32_t base;/* slave-relative addr of */ +/* master address space */ +}; + +#define to_fsi_master_hub (d) container_of(d, struct fsi_master_hub, master)#define to_fsi_slave (d) container_of(d, struct fsi_slave, dev) static int fsi_slave_read(struct fsi_slave *slave, uint32_t addr,
@@ -197,12 +215,156 @@ static int fsi_slave_write(struct fsi_slave *slave, uint32_t addr, slave->id, addr, val, size); } +/* +* FSI hub master support +* +* A hub master increases the number of potential target devices that the +* primary FSI master can access. For each link a primary master supports +* each of those links can in turn be chained to a hub master with multiple +* hub links of its own. Hubs differ from cascaded masters (cMFSI) in the +* total addressable range per link -hubs having address ranges that are much +* larger. +*/ +int hub_master_read (struct fsi_master *master,int linkno,uint8_t slave, +uint32_t addr,void *val,size_t size) +{ +struct fsi_master_hub *hub =to_fsi_master_hub (master); + + addr += (linkno *FSI_MASTER_HUB_LINK_SIZE ) + hub->base; +return fsi_slave_read (hub->slave, addr, val, size); +} + +int hub_master_write (struct fsi_master *master,int linkno,uint8_t slave, +uint32_t addr,const void *val,size_t size) +{ +struct fsi_master_hub *hub =to_fsi_master_hub (master); + + addr += (linkno *FSI_MASTER_HUB_LINK_SIZE ) + hub->base; +return fsi_slave_write (hub->slave, addr, val, size); +} + +int hub_master_break (struct fsi_master *master,int linkno) +{ +struct fsi_master_hub *hub =to_fsi_master_hub (master); +uint32_t command; +uint32_t break_offset =0x4 ;/* hw workaround */ +uint32_t addr; + + command =FSI_BREAK ; + addr = (linkno *FSI_MASTER_HUB_LINK_SIZE ) + hub->base; +return fsi_slave_write (hub->slave, addr + break_offset, &command, +sizeof (command)); +} + +int hub_master_link_enable (struct fsi_master *master,int linkno) +{ +struct fsi_master_hub *hub =to_fsi_master_hub (master); +uint32_t menp =L_MSB_MASK (linkno); +int rc; + + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MSENP0 , &menp, +sizeof (menp)); + +/* Wait for hw to finish enable */ +mdelay (10 ); + +return rc; +} + +static int hub_master_init (struct fsi_master_hub *hub) +{ +int rc; +uint32_t mver; +struct fsi_master *master = &hub->master; + + master->read = hub_master_read; + master->write = hub_master_write; + master->send_break = hub_master_break; + master->link_enable = hub_master_link_enable; + +/* Initialize the MFSI (hub master) engine */ + rc =fsi_slave_read (hub->slave, hub->control_regs +FSI_MVER , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver =FSI_MRESP_RST_ALL_MASTER |FSI_MRESP_RST_ALL_LINK + |FSI_MRESP_RST_MCR |FSI_MRESP_RST_PYE ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MRESP0 , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver =FSI_MECTRL_EOAE |FSI_MECTRL_P8_AUTO_TERM ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MECTRL , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver =FSI_MMODE_EIP |FSI_MMODE_ECRC |FSI_MMODE_EPC + |fsi_mmode_crs0 (1 ) |fsi_mmode_crs1 (1 ) + |FSI_MMODE_P8_TO_LSB ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MMODE , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver =0xffff0000 ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MDLYR , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver = ~0 ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MSENP0 , &mver, +sizeof (mver)); +if (rc) +return rc; + +/* Leave enabled long enough for master logic to set up */ +udelay (1000 ); + + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MCENP0 , &mver, +sizeof (mver)); +if (rc) +return rc; + + rc =fsi_slave_read (hub->slave, hub->control_regs +FSI_MAEB , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver =FSI_MRESP_RST_ALL_MASTER |FSI_MRESP_RST_ALL_LINK ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MRESP0 , &mver, +sizeof (mver)); +if (rc) +return rc; + + rc =fsi_slave_read (hub->slave, hub->control_regs +FSI_MLEVP0 , &mver, +sizeof (mver)); +if (rc) +return rc; + +/* Reset the master bridge */ + mver =FSI_MRESB_RST_GEN ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MRESB0 , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver =FSI_MRESB_RST_ERR ; +return fsi_slave_write (hub->slave, hub->control_regs +FSI_MRESB0 , + &mver,sizeof (mver)); +} +static int fsi_slave_scan (struct fsi_slave *slave) {uint32_t engine_addr;uint32_t conf;int rc, i;uint8_t si1s_bit =1 ; +uint8_t conf_link_count =0 ; +struct fsi_master_hub *hub;INIT_LIST_HEAD (&slave->my_engines);
@@ -242,12 +404,50 @@ static int fsi_slave_scan(struct fsi_slave *slave) type = (conf &FSI_SLAVE_CONF_TYPE_MASK ) >>FSI_SLAVE_CONF_TYPE_SHIFT ; -/* -* Unused address areas are marked by a zero type value; this -* skips the defined address areas -*/ -if (type !=0 && slots !=0 ) { +switch (type) { +case 0 : +/* +* Unused address areas are marked by a zero type +* value; this skips the defined address areas +*/ +break ; + +case FSI_ENGID_HUB_MASTER : + hub_master_class =class_create (THIS_MODULE , +"hub-master" ); +if (!hub_master_class) +return -ENODEV ; + + hub =kzalloc (sizeof (*hub),GFP_KERNEL ); +if (!hub) +return -ENOMEM ; + hub->master.dev =device_create (hub_master_class,NULL , +0 , hub, (const char *)"%s" , +"hub" ); +if (!hub->master.dev) +return -ENODEV ; + +device_initialize (hub->master.dev); +dev_set_name (hub->master.dev,"%02x" , + hub->master.idx); + rc =device_add (hub->master.dev); +if (rc) +return rc; + + hub->base =FSI_HUB_LINK_OFFSET ; + hub->control_regs = engine_addr; + hub->slave = slave; + rc =hub_master_init (hub); + +break ; + +case FSI_ENGID_HUB_LINK : + conf_link_count++; + +break ; + +default :/* create device */ dev =fsi_create_device (slave);if (!dev)
@@ -286,6 +486,11 @@ static int fsi_slave_scan(struct fsi_slave *slave)break ; } +if (hub) { + hub->master.n_links = conf_link_count /2 ; +fsi_master_register (&hub->master); + } +return 0 ; }
drivers/fsi/fsi-master.h +57 -0
67 lines not on this page · raw message
Signature · 1 line
1.8.2.2
Quoted 376 lines · Christopher Bostic
Scan for links off of the mFSI master on CFAM. Add any devices detected to the existing list of FSI devices and notify any clients.
Signed-off-by Christopher Bostic <[email protected]>---
v3 - Squash all patches in series related to hub master into one
patch.-
fsi_slave_scanrefactor if/else to switch on type- Add device for hub master dev field
- Update method of setting
master->n_linksfor hubv2 - Refactor hub master structures, hub no longer a slave engine
- Add description of what a hub master is and how it differs from a cascaded master
--- drivers/fsi/fsi-core.c | 215 +++++++++++++++++++++++++++++++++++++++++++++-- drivers/fsi/fsi-master.h | 57 +++++++++++++ 2 files changed, 267 insertions(+), 5 deletions(-)drivers/fsi/fsi-core.c +210
-5@@ -20,12 +20,14 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/jiffies.h> +#include <linux/delay.h> #include "fsi-master.h" #define DEBUG #define FSI_N_SLAVES 4 +#define FSI_BREAK 0xc0de0000#define FSI_SLAVE_CONF_NEXT_MASK 0x80000000#define FSI_SLAVE_CONF_SLOTS_MASK 0x00ff0000@@ -43,9 +45,16 @@#define FSI_IPOLL_PERIOD msecs_to_jiffies(fsi_ipoll_period_ms) +#define FSI_ENGID_HUB_MASTER 0x1c +#define FSI_ENGID_HUB_LINK 0x1d +#define FSI_HUB_LINK_OFFSET 0x80000 +#define FSI_MASTER_HUB_LINK_SIZE 0x80000 +#define FSI_HUB_MASTER_MAX_LINKS 8 +static const int engine_page_size =0x400 ;static struct task_struct *master_ipoll;static unsigned int fsi_ipoll_period_ms =100 ; +struct class *hub_master_class;static DEFINE_IDA (master_ida);@@ -58,6 +67,15 @@ struct fsi_slave {uint8_t id; }; +struct fsi_master_hub { +struct fsi_master master; +struct fsi_slave *slave; +uint32_t control_regs;/* slave-relative addr regs */ +uint32_t base;/* slave-relative addr of */ +/* master address space */ +}; + +#define to_fsi_master_hub (d) container_of(d, struct fsi_master_hub, master)#define to_fsi_slave (d) container_of(d, struct fsi_slave, dev) static int fsi_slave_read(struct fsi_slave *slave, uint32_t addr,@@ -197,12 +215,156 @@ static int fsi_slave_write(struct fsi_slave *slave, uint32_t addr, slave->id, addr, val, size); } +/* +* FSI hub master support +* +* A hub master increases the number of potential target devices that the +* primary FSI master can access. For each link a primary master supports +* each of those links can in turn be chained to a hub master with multiple +* hub links of its own. Hubs differ from cascaded masters (cMFSI) in the +* total addressable range per link -hubs having address ranges that are much +* larger. +*/ +int hub_master_read (struct fsi_master *master,int linkno,uint8_t slave, +uint32_t addr,void *val,size_t size) +{ +struct fsi_master_hub *hub =to_fsi_master_hub (master); + + addr += (linkno *FSI_MASTER_HUB_LINK_SIZE ) + hub->base; +return fsi_slave_read (hub->slave, addr, val, size); +} + +int hub_master_write (struct fsi_master *master,int linkno,uint8_t slave, +uint32_t addr,const void *val,size_t size) +{ +struct fsi_master_hub *hub =to_fsi_master_hub (master); + + addr += (linkno *FSI_MASTER_HUB_LINK_SIZE ) + hub->base; +return fsi_slave_write (hub->slave, addr, val, size); +} + +int hub_master_break (struct fsi_master *master,int linkno) +{ +struct fsi_master_hub *hub =to_fsi_master_hub (master); +uint32_t command; +uint32_t break_offset =0x4 ;/* hw workaround */ +uint32_t addr; + + command =FSI_BREAK ; + addr = (linkno *FSI_MASTER_HUB_LINK_SIZE ) + hub->base; +return fsi_slave_write (hub->slave, addr + break_offset, &command, +sizeof (command)); +} + +int hub_master_link_enable (struct fsi_master *master,int linkno) +{ +struct fsi_master_hub *hub =to_fsi_master_hub (master); +uint32_t menp =L_MSB_MASK (linkno); +int rc; + + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MSENP0 , &menp, +sizeof (menp)); + +/* Wait for hw to finish enable */ +mdelay (10 ); + +return rc; +} + +static int hub_master_init (struct fsi_master_hub *hub) +{ +int rc; +uint32_t mver; +struct fsi_master *master = &hub->master; + + master->read = hub_master_read; + master->write = hub_master_write; + master->send_break = hub_master_break; + master->link_enable = hub_master_link_enable; + +/* Initialize the MFSI (hub master) engine */ + rc =fsi_slave_read (hub->slave, hub->control_regs +FSI_MVER , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver =FSI_MRESP_RST_ALL_MASTER |FSI_MRESP_RST_ALL_LINK + |FSI_MRESP_RST_MCR |FSI_MRESP_RST_PYE ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MRESP0 , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver =FSI_MECTRL_EOAE |FSI_MECTRL_P8_AUTO_TERM ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MECTRL , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver =FSI_MMODE_EIP |FSI_MMODE_ECRC |FSI_MMODE_EPC + |fsi_mmode_crs0 (1 ) |fsi_mmode_crs1 (1 ) + |FSI_MMODE_P8_TO_LSB ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MMODE , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver =0xffff0000 ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MDLYR , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver = ~0 ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MSENP0 , &mver, +sizeof (mver)); +if (rc) +return rc; + +/* Leave enabled long enough for master logic to set up */ +udelay (1000 ); + + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MCENP0 , &mver, +sizeof (mver)); +if (rc) +return rc; + + rc =fsi_slave_read (hub->slave, hub->control_regs +FSI_MAEB , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver =FSI_MRESP_RST_ALL_MASTER |FSI_MRESP_RST_ALL_LINK ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MRESP0 , &mver, +sizeof (mver)); +if (rc) +return rc; + + rc =fsi_slave_read (hub->slave, hub->control_regs +FSI_MLEVP0 , &mver, +sizeof (mver)); +if (rc) +return rc; + +/* Reset the master bridge */ + mver =FSI_MRESB_RST_GEN ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MRESB0 , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver =FSI_MRESB_RST_ERR ; +return fsi_slave_write (hub->slave, hub->control_regs +FSI_MRESB0 , + &mver,sizeof (mver)); +} +static int fsi_slave_scan (struct fsi_slave *slave) {uint32_t engine_addr;uint32_t conf;int rc, i;uint8_t si1s_bit =1 ; +uint8_t conf_link_count =0 ; +struct fsi_master_hub *hub;INIT_LIST_HEAD (&slave->my_engines);@@ -242,12 +404,50 @@ static int fsi_slave_scan(struct fsi_slave *slave) type = (conf &FSI_SLAVE_CONF_TYPE_MASK ) >>FSI_SLAVE_CONF_TYPE_SHIFT ; -/* -* Unused address areas are marked by a zero type value; this -* skips the defined address areas -*/ -if (type !=0 && slots !=0 ) { +switch (type) { +case 0 : +/* +* Unused address areas are marked by a zero type +* value; this skips the defined address areas +*/ +break ; + +case FSI_ENGID_HUB_MASTER : + hub_master_class =class_create (THIS_MODULE , +"hub-master" ); +if (!hub_master_class) +return -ENODEV ; + + hub =kzalloc (sizeof (*hub),GFP_KERNEL ); +if (!hub) +return -ENOMEM ; + hub->master.dev =device_create (hub_master_class,NULL , +0 , hub, (const char *)"%s" , +"hub" ); +if (!hub->master.dev) +return -ENODEV ; + +device_initialize (hub->master.dev); +dev_set_name (hub->master.dev,"%02x" , + hub->master.idx); + rc =device_add (hub->master.dev); +if (rc) +return rc; + + hub->base =FSI_HUB_LINK_OFFSET ; + hub->control_regs = engine_addr; + hub->slave = slave; + rc =hub_master_init (hub); + +break ; + +case FSI_ENGID_HUB_LINK : + conf_link_count++; + +break ; + +default :/* create device */ dev =fsi_create_device (slave);if (!dev)@@ -286,6 +486,11 @@ static int fsi_slave_scan(struct fsi_slave *slave)break ; } +if (hub) { + hub->master.n_links = conf_link_count /2 ; +fsi_master_register (&hub->master); + } +return 0 ; }drivers/fsi/fsi-master.h +57
-0@@ -19,6 +19,52 @@#include <linux/device.h> +/* Control Registers */ +#define FSI_MMODE 0x0/* R/W: mode */ +#define FSI_MDLYR 0x4/* R/W: delay */ +#define FSI_MCRSP 0x8/* R/W: clock rate */ +#define FSI_MENP0 0x10/* R/W: enable */ +#define FSI_MLEVP0 0x18/* R: plug detect */ +#define FSI_MSENP0 0x18/* S: Set enable */ +#define FSI_MCENP0 0x20/* C: Clear enable */ +#define FSI_MAEB 0x70/* R: Error address */ +#define FSI_MVER 0x74/* R: master version/type */ +#define FSI_MRESP0 0xd0/* W: Port reset */ +#define FSI_MESRB0 0x1d0/* R: Master error status */ +#define FSI_MRESB0 0x1d0/* W: Reset bridge */ +#define FSI_MECTRL 0x2e0/* W: Error control */ + +/* MMODE: Mode control */ +#define FSI_MMODE_EIP 0x80000000/* Enable interrupt polling */ +#define FSI_MMODE_ECRC 0x40000000/* Enable error recovery */ +#define FSI_MMODE_EPC 0x10000000/* Enable parity checking */ +#define FSI_MMODE_P8_TO_LSB 0x00000010/* Timeout value LSB */ +/* Rolf Fritz Nov 20, 2013: */ +/* MSB=1, LSB=0 is 0.8 ms */ +/* MSB=0, LSB=1 is 0.9 ms */ +#define FSI_MMODE_CRS0SHFT 18/* Clk rate selection 0 shift */ +#define FSI_MMODE_CRS0MASK 0x3ff/* Clk rate selection 0 mask */ +#define FSI_MMODE_CRS1SHFT 8/* Clk rate selection 1 shift */ +#define FSI_MMODE_CRS1MASK 0x3ff/* Clk rate selection 1 mask */ + +/* MRESB: Reset brindge */ +#define FSI_MRESB_RST_GEN 0x80000000/* General reset */ +#define FSI_MRESB_RST_ERR 0x40000000/* Error Reset */ + +/* MRESB: Reset port */ +#define FSI_MRESP_RST_ALL_MASTER 0x20000000/* Reset all FSI masters */ +#define FSI_MRESP_RST_ALL_LINK 0x10000000/* Reset all FSI port contr. */ +#define FSI_MRESP_RST_MCR 0x08000000/* Reset FSI master reg. */ +#define FSI_MRESP_RST_PYE 0x04000000/* Reset FSI parity error */ +#define FSI_MRESP_RST_ALL 0xfc000000/* Reset any error */ + +/* MECTRL: Error control */ +#define FSI_MECTRL_EOAE 0x8000/* Enable machine check when */ +/* master 0 in error */ +#define FSI_MECTRL_P8_AUTO_TERM 0x4000/* Auto terminate */ + +#define L_MSB_MASK (x) (0x80000000 >> (x)) +struct fsi_master {struct list_head my_slaves;bool slave_list;@@ -61,4 +107,15 @@ extern int fsi_master_start_ipoll(struct fsi_master *master);*/ uint8_t fsi_crc4 (uint8_t c,uint64_t x,int bits); +/* mmode encoders */ +static inline u32 fsi_mmode_crs0 (u32 x) +{ +return (x &FSI_MMODE_CRS0MASK ) <<FSI_MMODE_CRS0SHFT ; +} + +static inline u32 fsi_mmode_crs1 (u32 x) +{ +return (x &FSI_MMODE_CRS1MASK ) <<FSI_MMODE_CRS1SHFT ; +} +#endif /* DRIVERS_FSI_MASTER_H */
Quoted 13 lines · Christopher Bostic
Scan for links off of the mFSI master on CFAM. Add any devices detected to the existing list of FSI devices and notify any clients.
Signed-off-by Christopher Bostic <[email protected]>---
v3 - Squash all patches in series related to hub master into one
patch.-
fsi_slave_scanrefactor if/else to switch on type
Quoted 8 lines
- Add device for hub master dev field
- Update method of setting
master->n_linksfor hubv2 - Refactor hub master structures, hub no longer a slave engine
- Add description of what a hub master is and how it differs from a cascaded master
Again, the changelog is really good. But it should be below the following line.
Quoted 61 lines
--- drivers/fsi/fsi-core.c | 215 +++++++++++++++++++++++++++++++++++++++++++++-- drivers/fsi/fsi-master.h | 57 +++++++++++++ 2 files changed, 267 insertions(+), 5 deletions(-)drivers/fsi/fsi-core.c +18
-0@@ -20,12 +20,14 @@#include <linux/module.h> #include <linux/slab.h> #include <linux/jiffies.h> +#include <linux/delay.h> #include "fsi-master.h" #define DEBUG #define FSI_N_SLAVES 4 +#define FSI_BREAK 0xc0de0000#define FSI_SLAVE_CONF_NEXT_MASK 0x80000000#define FSI_SLAVE_CONF_SLOTS_MASK 0x00ff0000@@ -43,9 +45,16 @@#define FSI_IPOLL_PERIOD msecs_to_jiffies(fsi_ipoll_period_ms) +#define FSI_ENGID_HUB_MASTER 0x1c +#define FSI_ENGID_HUB_LINK 0x1d +#define FSI_HUB_LINK_OFFSET 0x80000 +#define FSI_MASTER_HUB_LINK_SIZE 0x80000 +#define FSI_HUB_MASTER_MAX_LINKS 8 +static const int engine_page_size =0x400 ;static struct task_struct *master_ipoll;static unsigned int fsi_ipoll_period_ms =100 ; +struct class *hub_master_class;static DEFINE_IDA (master_ida);@@ -58,6 +67,15 @@ struct fsi_slave {uint8_t id; }; +struct fsi_master_hub { +struct fsi_master master; +struct fsi_slave *slave; +uint32_t control_regs;/* slave-relative addr regs */ +uint32_t base;/* slave-relative addr of */ +/* master address space */ +}; + +#define to_fsi_master_hub (d) container_of(d, struct fsi_master_hub, master)#define to_fsi_slave (d) container_of(d, struct fsi_slave, dev) static int fsi_slave_read(struct fsi_slave *slave, uint32_t addr,@@ -197,12 +215,156 @@ static int fsi_slave_write(struct fsi_slave *slave, uint32_t addr, slave->id, addr, val, size); }
drivers/fsi/fsi-core.c static int fsi_slave_write(struct fsi_slave *slave, uint32_t addr, · line 227
Quoted 10 lines
drivers/fsi/fsi-core.c +10
-0+/* +* FSI hub master support +* +* A hub master increases the number of potential target devices that the +* primary FSI master can access. For each link a primary master supports +* each of those links can in turn be chained to a hub master with multiple +* hub links of its own. Hubs differ from cascaded masters (cMFSI) in the +* total addressable range per link -hubs having address ranges that are much +* larger. +*/
In a discussion we were having the other day I heard Jeremy describe it as hubs contain the registers that describe tehm, but cascaded masters are described by their parent. I think that detail is useful to add here.
Quoted 13 lines
drivers/fsi/fsi-core.c +13
-0+int hub_master_read (struct fsi_master *master,int linkno,uint8_t slave, +uint32_t addr,void *val,size_t size) +{ +struct fsi_master_hub *hub =to_fsi_master_hub (master); + + addr += (linkno *FSI_MASTER_HUB_LINK_SIZE ) + hub->base; +return fsi_slave_read (hub->slave, addr, val, size); +} + +int hub_master_write (struct fsi_master *master,int linkno,uint8_t slave, +uint32_t addr,const void *val,size_t size) +{ +struct fsi_master_hub *hub =to_fsi_master_hub (master);
drivers/fsi/fsi-core.c static int fsi_slave_write(struct fsi_slave *slave, uint32_t addr, · line 250
Quoted 10 lines
drivers/fsi/fsi-core.c +10
-0+ + addr += (linkno *FSI_MASTER_HUB_LINK_SIZE ) + hub->base; +return fsi_slave_write (hub->slave, addr, val, size); +} + +int hub_master_break (struct fsi_master *master,int linkno) +{ +struct fsi_master_hub *hub =to_fsi_master_hub (master); +uint32_t command; +uint32_t break_offset =0x4 ;/* hw workaround */
Can you elaborate on the hardware workaround?
Quoted 9 lines
drivers/fsi/fsi-core.c +9
-0+uint32_t addr; + + command =FSI_BREAK ; + addr = (linkno *FSI_MASTER_HUB_LINK_SIZE ) + hub->base; +return fsi_slave_write (hub->slave, addr + break_offset, &command, +sizeof (command)); +} + +int hub_master_link_enable (struct fsi_master *master,int linkno)
drivers/fsi/fsi-core.c static int fsi_slave_write(struct fsi_slave *slave, uint32_t addr, · line 269
Quoted 10 lines
drivers/fsi/fsi-core.c +10
-0+{ +struct fsi_master_hub *hub =to_fsi_master_hub (master); +uint32_t menp =L_MSB_MASK (linkno); +int rc; + + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MSENP0 , &menp, +sizeof (menp)); + +/* Wait for hw to finish enable */ +mdelay (10 );
Where does the figure of 10ms come from?
Quoted 46 lines
drivers/fsi/fsi-core.c +46
-0+ +return rc; +} + +static int hub_master_init (struct fsi_master_hub *hub) +{ +int rc; +uint32_t mver; +struct fsi_master *master = &hub->master; + + master->read = hub_master_read; + master->write = hub_master_write; + master->send_break = hub_master_break; + master->link_enable = hub_master_link_enable; + +/* Initialize the MFSI (hub master) engine */ + rc =fsi_slave_read (hub->slave, hub->control_regs +FSI_MVER , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver =FSI_MRESP_RST_ALL_MASTER |FSI_MRESP_RST_ALL_LINK + |FSI_MRESP_RST_MCR |FSI_MRESP_RST_PYE ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MRESP0 , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver =FSI_MECTRL_EOAE |FSI_MECTRL_P8_AUTO_TERM ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MECTRL , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver =FSI_MMODE_EIP |FSI_MMODE_ECRC |FSI_MMODE_EPC + |fsi_mmode_crs0 (1 ) |fsi_mmode_crs1 (1 ) + |FSI_MMODE_P8_TO_LSB ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MMODE , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver =0xffff0000 ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MDLYR , &mver, +sizeof (mver)); +if (rc)
drivers/fsi/fsi-core.c static int fsi_slave_write(struct fsi_slave *slave, uint32_t addr, · line 325
Quoted 10 lines
drivers/fsi/fsi-core.c +10
-0+return rc; + + mver = ~0 ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MSENP0 , &mver, +sizeof (mver)); +if (rc) +return rc; + +/* Leave enabled long enough for master logic to set up */ +udelay (1000 );
Where does the figure of 1000 come from?
Quoted 64 lines
drivers/fsi/fsi-core.c +46
-5+ + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MCENP0 , &mver, +sizeof (mver)); +if (rc) +return rc; + + rc =fsi_slave_read (hub->slave, hub->control_regs +FSI_MAEB , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver =FSI_MRESP_RST_ALL_MASTER |FSI_MRESP_RST_ALL_LINK ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MRESP0 , &mver, +sizeof (mver)); +if (rc) +return rc; + + rc =fsi_slave_read (hub->slave, hub->control_regs +FSI_MLEVP0 , &mver, +sizeof (mver)); +if (rc) +return rc; + +/* Reset the master bridge */ + mver =FSI_MRESB_RST_GEN ; + rc =fsi_slave_write (hub->slave, hub->control_regs +FSI_MRESB0 , &mver, +sizeof (mver)); +if (rc) +return rc; + + mver =FSI_MRESB_RST_ERR ; +return fsi_slave_write (hub->slave, hub->control_regs +FSI_MRESB0 , + &mver,sizeof (mver)); +} +static int fsi_slave_scan (struct fsi_slave *slave) {uint32_t engine_addr;uint32_t conf;int rc, i;uint8_t si1s_bit =1 ; +uint8_t conf_link_count =0 ; +struct fsi_master_hub *hub;INIT_LIST_HEAD (&slave->my_engines);@@ -242,12 +404,50 @@ static int fsi_slave_scan(struct fsi_slave *slave) type = (conf &FSI_SLAVE_CONF_TYPE_MASK ) >>FSI_SLAVE_CONF_TYPE_SHIFT ; -/* -* Unused address areas are marked by a zero type value; this -* skips the defined address areas -*/ -if (type !=0 && slots !=0 ) { +switch (type) { +case 0 : +/* +* Unused address areas are marked by a zero type +* value; this skips the defined address areas +*/ +break ; + +case FSI_ENGID_HUB_MASTER : + hub_master_class = class_create(THIS_MODULE,
drivers/fsi/fsi-core.c static int fsi_slave_scan(struct fsi_slave *slave) · line 426
Quoted 10 lines
drivers/fsi/fsi-core.c +9
-0+ "hub-master"); +if (!hub_master_class) +return -ENODEV ; + + hub =kzalloc (sizeof (*hub),GFP_KERNEL ); +if (!hub) +return -ENOMEM ; + hub->master.dev = device_create(hub_master_class, NULL, + 0, hub, (const char *)"%s",
You do not need to cast.
Quoted 115 lines
drivers/fsi/fsi-core.c +29
-0+ "hub"); +if (!hub->master.dev) +return -ENODEV ; + +device_initialize (hub->master.dev); +dev_set_name (hub->master.dev,"%02x" , + hub->master.idx); + rc =device_add (hub->master.dev); +if (rc) +return rc; + + hub->base =FSI_HUB_LINK_OFFSET ; + hub->control_regs = engine_addr; + hub->slave = slave; + rc =hub_master_init (hub); + +break ; + +case FSI_ENGID_HUB_LINK : + conf_link_count++; + +break ; + +default :/* create device */ dev =fsi_create_device (slave);if (!dev)@@ -286,6 +486,11 @@ static int fsi_slave_scan(struct fsi_slave *slave)break ; } +if (hub) { + hub->master.n_links = conf_link_count /2 ; +fsi_master_register (&hub->master); + } +return 0 ; }drivers/fsi/fsi-master.h +57
-1@@ -19,6 +19,52 @@#include <linux/device.h> +/* Control Registers */ +#define FSI_MMODE 0x0/* R/W: mode */ +#define FSI_MDLYR 0x4/* R/W: delay */ +#define FSI_MCRSP 0x8/* R/W: clock rate */ +#define FSI_MENP0 0x10/* R/W: enable */ +#define FSI_MLEVP0 0x18/* R: plug detect */ +#define FSI_MSENP0 0x18/* S: Set enable */ +#define FSI_MCENP0 0x20/* C: Clear enable */ +#define FSI_MAEB 0x70/* R: Error address */ +#define FSI_MVER 0x74/* R: master version/type */ +#define FSI_MRESP0 0xd0/* W: Port reset */ +#define FSI_MESRB0 0x1d0/* R: Master error status */ +#define FSI_MRESB0 0x1d0/* W: Reset bridge */ +#define FSI_MECTRL 0x2e0/* W: Error control */ + +/* MMODE: Mode control */ +#define FSI_MMODE_EIP 0x80000000/* Enable interrupt polling */ +#define FSI_MMODE_ECRC 0x40000000/* Enable error recovery */ +#define FSI_MMODE_EPC 0x10000000/* Enable parity checking */ +#define FSI_MMODE_P8_TO_LSB 0x00000010/* Timeout value LSB */ +/* Rolf Fritz Nov 20, 2013: */ +/* MSB=1, LSB=0 is 0.8 ms */ +/* MSB=0, LSB=1 is 0.9 ms */ +#define FSI_MMODE_CRS0SHFT 18/* Clk rate selection 0 shift */ +#define FSI_MMODE_CRS0MASK 0x3ff/* Clk rate selection 0 mask */ +#define FSI_MMODE_CRS1SHFT 8/* Clk rate selection 1 shift */ +#define FSI_MMODE_CRS1MASK 0x3ff/* Clk rate selection 1 mask */ + +/* MRESB: Reset brindge */ +#define FSI_MRESB_RST_GEN 0x80000000/* General reset */ +#define FSI_MRESB_RST_ERR 0x40000000/* Error Reset */ + +/* MRESB: Reset port */ +#define FSI_MRESP_RST_ALL_MASTER 0x20000000/* Reset all FSI masters */ +#define FSI_MRESP_RST_ALL_LINK 0x10000000/* Reset all FSI port contr. */ +#define FSI_MRESP_RST_MCR 0x08000000/* Reset FSI master reg. */ +#define FSI_MRESP_RST_PYE 0x04000000/* Reset FSI parity error */ +#define FSI_MRESP_RST_ALL 0xfc000000/* Reset any error */ + +/* MECTRL: Error control */ +#define FSI_MECTRL_EOAE 0x8000/* Enable machine check when */ +/* master 0 in error */ +#define FSI_MECTRL_P8_AUTO_TERM 0x4000/* Auto terminate */ + +#define L_MSB_MASK (x) (0x80000000 >> (x)) +struct fsi_master {struct list_head my_slaves;bool slave_list;@@ -61,4 +107,15 @@ extern int fsi_master_start_ipoll(struct fsi_master *master);*/ uint8_t fsi_crc4 (uint8_t c,uint64_t x,int bits); +/* mmode encoders */ +static inline u32 fsi_mmode_crs0 (u32 x) +{ +return (x &FSI_MMODE_CRS0MASK ) <<FSI_MMODE_CRS0SHFT ; +} + +static inline u32 fsi_mmode_crs1 (u32 x) +{ +return (x &FSI_MMODE_CRS1MASK ) <<FSI_MMODE_CRS1SHFT ; +} +#endif /* DRIVERS_FSI_MASTER_H */ --1.8.2.2
Hi Chris,
Quoted 3 lines
Scan for links off of the mFSI master on CFAM. Add any devices detected to the existing list of FSI devices and notify any clients.
Looking pretty good now, but there are still some changes required in the new code:
Quoted 10 lines
drivers/fsi/fsi-core.c +1
-5@@ -242,12 +404,50 @@ static int fsi_slave_scan(struct fsi_slave *slave) type = (conf &FSI_SLAVE_CONF_TYPE_MASK ) >>FSI_SLAVE_CONF_TYPE_SHIFT ; -/* -* Unused address areas are marked by a zero type value; this -* skips the defined address areas -*/ -if (type !=0 && slots !=0 ) { +switch (type) {
drivers/fsi/fsi-core.c static int fsi_slave_scan(struct fsi_slave *slave) · line 417
Quoted 10 lines
drivers/fsi/fsi-core.c +10
-0+case 0 : +/* +* Unused address areas are marked by a zero type +* value; this skips the defined address areas +*/ +break ; + +case FSI_ENGID_HUB_MASTER : + hub_master_class =class_create (THIS_MODULE , +"hub-master" );
Why are you creating a hub-specific class, and why are you doing that here?
If we want to use classes (which we may want to at some point), we should have a fsi-master class, rather than one only for hub masters. And then one for the slave engines too.
However, this is not the place to do this. This will cause a WARN_ON on the second hub we find.
I assume this is simply so that you can use device_create(). However, since we're not using classes at present, just create the struct device in the same way we have in other places in this file:
hub->master.dev = kzalloc(sizeof(*hub->master.dev), GFP_KERNEL); if (!hub->master.dev) return -ENODEV; device_initialize(hub->master.dev);
Then, you want to use an appropriate name (just using a number is a bit obscure), and set the parent too:
dev_set_name(hub->master.dev, "hub@%02x", hub->master.idx); hub->master.dev->parent = &slave->dev;
... and we probably want a dev->release function too, to free the device.
drivers/fsi/fsi-core.c static int fsi_slave_scan(struct fsi_slave *slave) · line 451
Quoted 7 lines
drivers/fsi/fsi-core.c +6
-0+case FSI_ENGID_HUB_LINK : + conf_link_count++; + +break ; + +default :/* create device */
We've lost the (slots != 0) check from this condition.
Regards,
Jeremy