I3C mastership handover support
Subsystems (4)
v8 cover I3C mastership handover support
Main changes between v7 and v8 are:
- Document format changed from table to DOT diagram
- Appropriate names for few functions
- Moved mastership request process entirely to the driver
- Reuse of i3c_master_add_i3c_dev_locked in core defslvs processing
Main changes between v6 and v7 are:
- Added separate functions for main and secondary
master initialization
- Secondary master initialization don't wait for
DEFSLSVS.
- Change to use I2C device information from DTS,
and corresponding changes in controller driver
and I3C core DEFSLVS processing to ignore I2C
devices received in DEFSLVS
- Reverted bus_init split
- Fixed formatting issues in document
Main changes between v5 and v6 are:
- Moved populate_bus() hook to master subsystem code.
- For secondary master initialization i3c_master_register spawan separate threads, as secondary master may have to wait for DEFSLVS and bus mastership.
- Populate bus info is based on DEFSLVS data and take care of hot plugged / unplugged I3C devices.
- Split bus_init into bus_init and master_set_info callbacks
- Moved mastership aquire and handover to separate state machines.
- Added DEFSLVS processing code.
- Moved back all locks in side the subsystem code.
- Secondary mastership support to Cadence I3C master controller driver
- Sysfs key 'i3c_acquire_bus' to acauire bus.
- NULL check for pool pointer in i3c_generic_ibi_free_pool.
Main changes between v4 and v5 are:
- Add populate_bus() hook
- Split i3c_master_register into init and register pair
- Split device information retrieval, let add partialy discovered devices
- Make i3c_master_set_info private
- Add separate function to register secondary master
- Reworked secondary master register in CDNS driver
- Export i3c_bus_set_mode
Main changes between v3 and v4 are:
- Reworked acquire bus ownership
- Refactored the code
Main changes between v2 and v3 are:
- Added DEFSLVS devices are registered from master driver
- Reworked I2C registering on secondary master side
- Reworked Mastership event is enabled/disabled globally (for all devices)
Main changes between initial version and v2 are:
- Reworked devices registration on secondary master side
- Reworked mastership event disabling/enabling
- Reworked bus locking during mastership takeover process
- Added DEFSLVS devices registration during initialization
- Fixed style issues
Parshuram Thombare (7):
i3c: master: master initialization flow document
i3c: master: use i3c_master_register only for main master
i3c: master: add i3c_secondary_master_register
i3c: master: add mastership handover support
i3c: master: add defslvs processing
i3c: master: sysfs key for acquire bus
i3c: master: mastership handover, defslvs processing in cdns
controller driver
Documentation/driver-api/i3c/index.rst | 1 + .../i3c/master-initialization-flow.rst | 190 +++++++ drivers/i3c/master.c | 486 ++++++++++++++++-- drivers/i3c/master/dw-i3c-master.c | 4 +- drivers/i3c/master/i3c-master-cdns.c | 329 +++++++++++- include/linux/i3c/master.h | 23 +- 6 files changed, 964 insertions(+), 69 deletions(-) create mode 100644 Documentation/driver-api/i3c/master-initialization-flow.rst
Signature · 7 lines
2.17.1 _______________________________________________ linux-i3c mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-i3c
PATCH v8 1/7 i3c: master: master initialization flow document
Document describing master initialization, mastership handover and DEFSLVS handling processes.
--- Documentation/driver-api/i3c/index.rst | 1 + .../i3c/master-initialization-flow.rst | 187 ++++++++++++++++++ 2 files changed, 188 insertions(+) create mode 100644 Documentation/driver-api/i3c/master-initialization-flow.rst
Documentation/driver-api/i3c/index.rst +1 -0
@@ -9,3 +9,4 @@ I3C subsystem protocol device-driver-api master-driver-api + master-initialization-flow
Documentation/driver-api/i3c/master-initialization-flow.rst new file +187 -0
187 lines not on this page · raw message
Signature · 7 lines
2.17.1 _______________________________________________ linux-i3c mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-i3c
PATCH v8 2/7 i3c: master: use i3c_master_register only for main master
In reply to Parshuram ThombareRemoved last argument 'secondary' and restructured i3c_master_register to move code that can be common to i3c_secondary_master_register to separate function i3c_master_init.
--- drivers/i3c/master.c | 74 +++++++++++++++++----------- drivers/i3c/master/dw-i3c-master.c | 4 +- drivers/i3c/master/i3c-master-cdns.c | 4 +- include/linux/i3c/master.h | 7 ++- 4 files changed, 51 insertions(+), 38 deletions(-)
drivers/i3c/master.c +44 -30
@@ -1613,7 +1613,7 @@ static void i3c_master_detach_free_devs(struct i3c_master_controller *master) }/** -* i3c_master_bus_init() - initialize an I3C bus +* i3c_primary_master_bus_init() - initialize an I3C bus * @master: main master initializing the bus * * This function is following all initialisation steps described in the I3C
@@ -1642,7 +1642,7 @@ static void i3c_master_detach_free_devs(struct i3c_master_controller *master)* * Return: a 0 in case of success, an negative error code otherwise. */ -static int i3c_master_bus_init (struct i3c_master_controller *master) +static int i3c_primary_master_bus_init (struct i3c_master_controller *master) {enum i3c_addr_slot_status status;struct i2c_dev_boardinfo *i2cboardinfo;
@@ -2391,31 +2391,10 @@ static int i3c_master_check_ops(const struct i3c_master_controller_ops *ops)return 0 ; } -/** -* i3c_master_register() - register an I3C master -* @master: master used to send frames on the bus -* @parent: the parent device (the one that provides this I3C master -* controller) -* @ops: the master controller operations -* @secondary: true if you are registering a secondary master. Will return -* -ENOTSUPP if set to true since secondary masters are not yet -* supported -* -* This function takes care of everything for you: -* -* - creates and initializes the I3C bus -* - populates the bus with static I2C devs if @parent->of_node is not -* NULL -* - registers all I3C devices added by the controller during bus -* initialization -* - registers the I2C adapter and all I2C devices -* -* Return: 0 in case of success, a negative error code otherwise. -*/ -int i3c_master_register (struct i3c_master_controller *master, -struct device *parent, -const struct i3c_master_controller_ops *ops, -bool secondary) +static int i3c_master_init (struct i3c_master_controller *master, +struct device *parent, +const struct i3c_master_controller_ops *ops, +bool secondary) {struct i3c_bus *i3cbus =i3c_master_get_bus (master);enum i3c_bus_mode mode =I3C_BUS_MODE_PURE ;
@@ -2478,10 +2457,46 @@ int i3c_master_register(struct i3c_master_controller *master, goto err_put_dev; } - ret =i3c_master_bus_init (master); + ret =i3c_primary_master_bus_init (master);if (ret) goto err_put_dev; +return 0 ; + +err_put_dev: +put_device (&master->dev); + +return ret; +} + +/** +* i3c_primary_master_register() - register an I3C master +* @master: master used to send frames on the bus +* @parent: the parent device (the one that provides this I3C master +* controller) +* @ops: the master controller operations +* +* This function takes care of everything for you: +* +* - creates and initializes the I3C bus +* - populates the bus with static I2C devs if @parent->of_node is not +* NULL +* - registers all I3C devices added by the controller during bus +* initialization +* - registers the I2C adapter and all I2C devices +* +* Return: 0 in case of success, a negative error code otherwise. +*/ +int i3c_primary_master_register (struct i3c_master_controller *master, +struct device *parent, +const struct i3c_master_controller_ops *ops) +{ +int ret; + + ret =i3c_master_init (master, parent, ops, false); +if (ret) +return ret; + ret =device_add (&master->dev);if (ret) goto err_cleanup_bus;
@@ -2511,12 +2526,11 @@ int i3c_master_register(struct i3c_master_controller *master, err_cleanup_bus:i3c_master_bus_cleanup (master); -err_put_dev:put_device (&master->dev);return ret; } -EXPORT_SYMBOL_GPL (i3c_master_register); +EXPORT_SYMBOL_GPL (i3c_primary_master_register);/** * i3c_master_unregister() - unregister an I3C master
drivers/i3c/master/dw-i3c-master.c +2 -2
@@ -1157,8 +1157,8 @@ static int dw_i3c_probe(struct platform_device *pdev) master->maxdevs = ret >>16 ; master->free_pos =GENMASK (master->maxdevs -1 ,0 ); - ret =i3c_master_register (&master->base, &pdev->dev, - &dw_mipi_i3c_ops, false); + ret =i3c_primary_master_register (&master->base, &pdev->dev, + &dw_mipi_i3c_ops);if (ret) goto err_assert_rst;
drivers/i3c/master/i3c-master-cdns.c +2 -2
@@ -1614,8 +1614,8 @@ static int cdns_i3c_master_probe(struct platform_device *pdev)writel (MST_INT_IBIR_THR , master->regs +MST_IER );writel (DEVS_CTRL_DEV_CLR_ALL , master->regs +DEVS_CTRL ); - ret =i3c_master_register (&master->base, &pdev->dev, - &cdns_i3c_master_ops, false); + ret =i3c_primary_master_register (&master->base, &pdev->dev, + &cdns_i3c_master_ops);if (ret) goto err_disable_sysclk;
include/linux/i3c/master.h +3 -4
@@ -531,10 +531,9 @@ int i3c_master_do_daa(struct i3c_master_controller *master);int i3c_master_set_info (struct i3c_master_controller *master,const struct i3c_device_info *info); -int i3c_master_register (struct i3c_master_controller *master, -struct device *parent, -const struct i3c_master_controller_ops *ops, -bool secondary); +int i3c_primary_master_register (struct i3c_master_controller *master, +struct device *parent, +const struct i3c_master_controller_ops *ops);int i3c_master_unregister (struct i3c_master_controller *master);/**
Signature · 7 lines
2.17.1 _______________________________________________ linux-i3c mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-i3c
PATCH v8 3/7 i3c: master: add i3c_secondary_master_register
In reply to Parshuram Thombareadd i3c_secondary_master_register which is used
to register secondary masters.
--- drivers/i3c/master.c | 154 ++++++++++++++++++++++++++++++++++++- include/linux/i3c/master.h | 3 + 2 files changed, 156 insertions(+), 1 deletion(-)
drivers/i3c/master.c +153 -1
@@ -1768,6 +1768,90 @@ static int i3c_primary_master_bus_init(struct i3c_master_controller *master)return ret; } +/** +* i3c_secondary_master_bus_init() - initialize an I3C bus for secondary +* master +* @master: secondary master initializing the bus +* +* This function does +* +* 1. Attach I2C devs to the master +* +* 2. Call &i3c_master_controller_ops->bus_init() method to initialize +* the master controller. That's usually where the bus mode is selected +* (pure bus or mixed fast/slow bus) +* +* Once this is done, I2C devices should be usable. +* +* Return: a 0 in case of success, an negative error code otherwise. +*/ +static int i3c_secondary_master_bus_init (struct i3c_master_controller *master) +{ +enum i3c_addr_slot_status status; +struct i2c_dev_boardinfo *i2cboardinfo; +struct i2c_dev_desc *i2cdev; +int ret; + +/* +* First attach all devices with static definitions provided by the +* FW. +*/ +list_for_each_entry (i2cboardinfo, &master->boardinfo.i2c, node) { + status =i3c_bus_get_addr_slot_status (&master->bus, + i2cboardinfo->base.addr); +if (status !=I3C_ADDR_SLOT_FREE ) { + ret = -EBUSY ; + goto err_detach_devs; + } + +i3c_bus_set_addr_slot_status (&master->bus, + i2cboardinfo->base.addr, +I3C_ADDR_SLOT_I2C_DEV ); + + i2cdev =i3c_master_alloc_i2c_dev (master, i2cboardinfo); +if (IS_ERR (i2cdev)) { + ret =PTR_ERR (i2cdev); + goto err_detach_devs; + } + + ret =i3c_master_attach_i2c_dev (master, i2cdev); +if (ret) { +i3c_master_free_i2c_dev (i2cdev); + goto err_detach_devs; + } + } + +/* +* Now execute the controller specific ->bus_init() routine, which +* might configure its internal logic to match the bus limitations. +*/ + ret = master->ops->bus_init (master); +if (ret) + goto err_detach_devs; + +/* +* The master device should have been instantiated in ->bus_init(), +* complain if this was not the case. +*/ +if (!master->this) { +dev_err (&master->dev, +"master_set_info() was not called in ->bus_init()\n" ); + ret = -EINVAL ; + goto err_bus_cleanup; + } + +return 0 ; + +err_bus_cleanup: +if (master->ops->bus_cleanup) + master->ops->bus_cleanup (master); + +err_detach_devs: +i3c_master_detach_free_devs (master); + +return ret; +} +static void i3c_master_bus_cleanup (struct i3c_master_controller *master) {if (master->ops->bus_cleanup)
@@ -2457,7 +2541,10 @@ static int i3c_master_init(struct i3c_master_controller *master, goto err_put_dev; } - ret =i3c_primary_master_bus_init (master); +if (secondary) + ret =i3c_secondary_master_bus_init (master); +else + ret =i3c_primary_master_bus_init (master);if (ret) goto err_put_dev;
@@ -2532,6 +2619,71 @@ int i3c_primary_master_register(struct i3c_master_controller *master, }EXPORT_SYMBOL_GPL (i3c_primary_master_register); +/** +* i3c_secondary_master_register() - register an I3C secondary master +* @master: master used to send frames on the bus +* @parent: the parent device (the one that provides this I3C master +* controller) +* @ops: the master controller operations +* +* This function does minimal required initialization for secondary +* master, rest functionality like creating and registering I2C +* and I3C devices is done in defslvs processing. +* +* i3c_secondary_master_register() does following things - +* - creates and initializes the I3C bus +* - populates the bus with static I2C devs if @parent->of_node is not +* NULL +* initialization +* - allocate memory for defslvs_data.devs, which is used to receive +* defslvs list +* - create I3C device representing this master +* - registers the I2C adapter and all I2C devices +* +* Return: 0 in case of success, a negative error code otherwise. +*/ +int i3c_secondary_master_register (struct i3c_master_controller *master, +struct device *parent, +const struct i3c_master_controller_ops *ops) +{ +int ret; + + ret =i3c_master_init (master, parent, ops, true); +if (ret) +return ret; + + ret =device_add (&master->dev); +if (ret) + goto err_cleanup_bus; + +/* +* Expose our I3C bus as an I2C adapter so that I2C devices are exposed +* through the I2C subsystem. +*/ + ret =i3c_master_i2c_adapter_init (master); +if (ret) + goto err_del_dev; + +/* +* We're done initializing the bus and the controller, we can now +* register I3C devices from defslvs list. +*/ + master->init_done = true; + +return 0 ; + +err_del_dev: +device_del (&master->dev); + +err_cleanup_bus: +i3c_master_bus_cleanup (master); + +put_device (&master->dev); + +return ret; +} +EXPORT_SYMBOL_GPL (i3c_secondary_master_register); +/** * i3c_master_unregister() - unregister an I3C master * @master: master used to send frames on the bus
include/linux/i3c/master.h +3 -0
@@ -534,6 +534,9 @@ int i3c_master_set_info(struct i3c_master_controller *master,int i3c_primary_master_register (struct i3c_master_controller *master,struct device *parent,const struct i3c_master_controller_ops *ops); +int i3c_secondary_master_register (struct i3c_master_controller *master, +struct device *parent, +const struct i3c_master_controller_ops *ops);int i3c_master_unregister (struct i3c_master_controller *master);/**
Signature · 7 lines
2.17.1 _______________________________________________ linux-i3c mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-i3c
PATCH v8 4/7 i3c: master: add mastership handover support
In reply to Parshuram ThombareAdded mastership acquire and yield functions.
--- drivers/i3c/master.c | 176 +++++++++++++++++++++++++++++++++++-- include/linux/i3c/master.h | 6 ++ 2 files changed, 173 insertions(+), 9 deletions(-)
drivers/i3c/master.c +167 -9
@@ -43,6 +43,16 @@ static void i3c_bus_maintenance_lock(struct i3c_bus *bus)down_write (&bus->lock); } +/** +* i3c_bus_maintenance_downgrade_lock - Downgrade maintenance lock to +* normaluse lock. +* @bus: I3C bus to take the lock on +*/ +static void i3c_bus_maintenance_downgrade_lock (struct i3c_bus *bus) +{ +downgrade_write (&bus->lock); +} +/** * i3c_bus_maintenance_unlock - Release the bus lock after a maintenance * operation
@@ -467,6 +477,59 @@ static const char * const i3c_bus_mode_strings[] = { [I3C_BUS_MODE_MIXED_SLOW] = "mixed-slow", }; +static int i3c_master_enable_mr_events (struct i3c_master_controller *master) +{ +int ret; + + master->ops->enable_mr_events (master); +i3c_bus_maintenance_lock (&master->bus); + ret =i3c_master_enec_locked (master,I3C_BROADCAST_ADDR , +I3C_CCC_EVENT_MR |I3C_CCC_EVENT_HJ ); +i3c_bus_maintenance_unlock (&master->bus); + +return ret; +} + +/** +* i3c_master_acquire_bus() - acquire I3C bus mastership +* @m: I3C master object +* +* This function may sleep. +* It is expected to be called with normaluse_lock. +*/ +static int i3c_master_acquire_bus (struct i3c_master_controller *m) +{ +int ret =0 ; + +/* +* Request mastership needs maintenance(write) lock. So, to avoid +* deadlock, release normaluse(read) lock, which is expected to be +* held before calling this function. +* normaluse(read) lock is expected to be held before calling +* this function to avoid race with maintenance activities +* like DEFSLVS processing etc +*/ +i3c_bus_normaluse_unlock (&m->bus); +i3c_bus_maintenance_lock (&m->bus); + +if (m->this && m->this == m->bus.cur_master) { +i3c_master_disec_locked (m,I3C_BROADCAST_ADDR , +I3C_CCC_EVENT_MR | +I3C_CCC_EVENT_HJ ); + goto mr_req_done; + } + + ret = m->ops->request_mastership (m); +if (ret) + goto mr_req_done; + + m->bus.cur_master = m->this; + +mr_req_done: +i3c_bus_maintenance_downgrade_lock (&m->bus); +return ret; +} +static ssize_t mode_show (struct device *dev,struct device_attribute *da,char *buf)
@@ -685,6 +748,33 @@ static int i3c_master_send_ccc_cmd_locked(struct i3c_master_controller *master,return 0 ; } +static int i3c_master_get_accmst_locked (struct i3c_master_controller *master, +u8 addr) +{ +struct i3c_ccc_getaccmst *accmst; +struct i3c_ccc_cmd_dest dest; +struct i3c_ccc_cmd cmd; +int ret; + + accmst =i3c_ccc_cmd_dest_init (&dest, addr,sizeof (*accmst)); +if (!accmst) +return -ENOMEM ; + +i3c_ccc_cmd_init (&cmd, true,I3C_CCC_GETACCMST , &dest,1 ); + + ret =i3c_master_send_ccc_cmd_locked (master, &cmd); +if (ret) + goto out; + +if (dest.payload.len !=sizeof (*accmst)) + ret = -EIO ; + +out: +i3c_ccc_cmd_dest_cleanup (&dest); + +return ret; +} +static struct i2c_dev_desc *i3c_master_find_i2c_dev_by_addr (const struct i3c_master_controller *master,u16 addr)
@@ -1558,10 +1648,6 @@ int i3c_master_set_info(struct i3c_master_controller *master,if (!i3c_bus_dev_addr_is_avail (&master->bus, info->dyn_addr))return -EINVAL ; -if (I3C_BCR_DEVICE_ROLE (info->bcr) ==I3C_BCR_I3C_MASTER && - master->secondary) -return -EINVAL ; -if (master->this)return -EINVAL ;
@@ -1570,7 +1656,9 @@ int i3c_master_set_info(struct i3c_master_controller *master,return PTR_ERR (i3cdev); master->this = i3cdev; - master->bus.cur_master = master->this; + +if (!master->secondary) + master->bus.cur_master = master->this; ret =i3c_master_attach_i3c_dev (master, i3cdev);if (ret)
@@ -1612,6 +1700,74 @@ static void i3c_master_detach_free_devs(struct i3c_master_controller *master) } } +/** +* i3c_master_yield_bus() - yield I3C bus mastership +* @m: I3C master object +* @sec_mst_dyn_addr: address of device requesting mastership +* +* This function may sleep. +* It is expected to be called with normaluse_lock. +*/ +void +i3c_master_yield_bus (struct i3c_master_controller *m,u8 sec_mst_dyn_addr) +{ +struct i3c_dev_desc *i3cdev; +bool dev_found = false; +int ret =0 ; + +i3c_bus_maintenance_lock (&m->bus); +if (m->this != m->bus.cur_master) + goto mr_yield_done; + +i3c_bus_for_each_i3cdev (&m->bus, i3cdev) { +if (sec_mst_dyn_addr == i3cdev->info.dyn_addr) { + dev_found = true; +break ; + } + } + +/* Requesting device not found on i3c list. This should never happen. */ +if (!dev_found) + goto mr_yield_done; + +/* +* Maintenance lock and master check above is used to +* avoid race amongst devices sending MR requests +* at the same time, as soon as ENEC MST is sent by the current +* master. It ensure that only one MR request is processed, +* rest MR requests on losing devices will timeout in wait MR +* DONE state. And next MR requests are blocked due to DISEC MST +* sent by current master in yield operation. +* New master should send ENEC MST once it's work is done. +* maintainanace lock is also needed for i3c_master_get_accmst_locked. +*/ + + ret =i3c_master_disec_locked (m,I3C_BROADCAST_ADDR , +I3C_CCC_EVENT_MR | +I3C_CCC_EVENT_HJ ); +/* +* Once mastership is given to the new master, it is expected that +* MR is disabled prior to that and new master is responsible to +* enable it by broadcasting ENEC MR when it's work is done. +* If DISEC MR fails and we still go ahead with handover, chances +* are new master will get interrupted by unexpected MR requests. +*/ +if (ret) + goto mr_yield_done; + + ret =i3c_master_get_accmst_locked (m, sec_mst_dyn_addr); +if (ret) + goto mr_yield_done; + + m->bus.cur_master = i3cdev; + +mr_yield_done: +i3c_bus_maintenance_unlock (&m->bus); +if (ret) +i3c_master_enable_mr_events (m); +} +EXPORT_SYMBOL_GPL (i3c_master_yield_bus); +/** * i3c_primary_master_bus_init() - initialize an I3C bus * @master: main master initializing the bus
@@ -2472,6 +2628,9 @@ static int i3c_master_check_ops(const struct i3c_master_controller_ops *ops) !ops->recycle_ibi_slot))return -EINVAL ; +if (ops->request_mastership && !ops->enable_mr_events) +return -EINVAL ; +return 0 ; }
@@ -2485,10 +2644,6 @@ static int i3c_master_init(struct i3c_master_controller *master,struct i2c_dev_boardinfo *i2cbi;int ret; -/* We do not support secondary masters yet. */ -if (secondary) -return -ENOTSUPP ; - ret =i3c_master_check_ops (ops);if (ret)return ret;
@@ -2605,6 +2760,9 @@ int i3c_primary_master_register(struct i3c_master_controller *master,i3c_master_register_new_i3c_devs (master);i3c_bus_normaluse_unlock (&master->bus); +if (ops->request_mastership) + ret =i3c_master_enable_mr_events (master); +return 0 ; err_del_dev:
include/linux/i3c/master.h +6 -0
@@ -418,6 +418,8 @@ struct i3c_bus {* for a future IBI * This method is mandatory only if ->request_ibi is not * NULL. +* @request_mastership: send mastership request to the current master +* @enable_mr_events: enable mastership request handling by the controller */ struct i3c_master_controller_ops {int (*bus_init)(struct i3c_master_controller *master);
@@ -445,6 +447,8 @@ struct i3c_master_controller_ops {int (*disable_ibi)(struct i3c_dev_desc *dev);void (*recycle_ibi_slot)(struct i3c_dev_desc *dev,struct i3c_ibi_slot *slot); +int (*request_mastership)(struct i3c_master_controller *master); +void (*enable_mr_events)(struct i3c_master_controller *m); };/**
@@ -510,6 +514,8 @@ struct i3c_master_controller {#define i3c_bus_for_each_i3cdev (bus, dev) \ list_for_each_entry(dev, &(bus)->devs.i3c, common.node) +void i3c_master_yield_bus (struct i3c_master_controller *m, +u8 sec_mst_dyn_addr);int i3c_master_do_i2c_xfers (struct i3c_master_controller *master,const struct i2c_msg *xfers,int nxfers);
Signature · 7 lines
2.17.1 _______________________________________________ linux-i3c mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-i3c
PATCH v8 5/7 i3c: master: add defslvs processing
In reply to Parshuram ThombareAdded defslvs processing code to the I3C master subsystem.
--- drivers/i3c/master.c | 68 ++++++++++++++++++++++++++++++++++++-- include/linux/i3c/master.h | 7 ++++ 2 files changed, 73 insertions(+), 2 deletions(-)
drivers/i3c/master.c +66 -2
@@ -2127,7 +2127,7 @@ int i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master,else expected_dyn_addr = newdev->info.dyn_addr; -if (newdev->info.dyn_addr != expected_dyn_addr) { +if (!master->secondary && newdev->info.dyn_addr != expected_dyn_addr) {/* * Try to apply the expected dynamic address. If it fails, keep * the address assigned by the master.
@@ -2804,12 +2804,20 @@ int i3c_secondary_master_register(struct i3c_master_controller *master,struct device *parent, const struct i3c_master_controller_ops *ops) { - int ret; + int ret, sz; ret =i3c_master_init (master, parent, ops, true);if (ret)return ret; + sz =sizeof (struct i3c_ccc_dev_desc ) *I3C_BUS_MAX_DEVS ; + master->defslvs_data.devs =devm_kzalloc (&master->dev, sz, +GFP_KERNEL ); +if (!master->defslvs_data.devs) { + ret = -ENOMEM ; + goto err_cleanup_bus; + } + ret =device_add (&master->dev);if (ret) goto err_cleanup_bus;
@@ -2842,6 +2850,62 @@ int i3c_secondary_master_register(struct i3c_master_controller *master, }EXPORT_SYMBOL_GPL (i3c_secondary_master_register); +static int +i3c_master_populate_bus (struct i3c_master_controller *master,u8 dyn_addr) +{ +struct i3c_dev_desc *olddev; +struct i3c_ccc_dev_desc *desc; +int ret, slot; + +i3c_bus_for_each_i3cdev (&master->bus, olddev) +i3c_master_put_i3c_addrs (olddev); + + master->this->info.dyn_addr = dyn_addr; +i3c_master_get_i3c_addrs (master->this); + + desc = master->defslvs_data.devs; +for (slot =1 ; slot < master->defslvs_data.ndevs; slot++) { + ret =i3c_master_add_i3c_dev_locked (master, + desc[slot].dyn_addr); +if (ret) +break ; + } + +return ret; +} + +/** +* i3c_master_process_defslvs() - process I3C device list received in +* DEFSLVS for device plug/unplug and address change. +* @m: I3C master object +* @dyn_addr: Current dynamic address of this device +* +* This function may sleep, so should not be called in the atomic context. +*/ +int i3c_master_process_defslvs (struct i3c_master_controller *m,u8 dyn_addr) +{ +int ret; + +i3c_bus_normaluse_lock (&m->bus); + ret =i3c_master_acquire_bus (m); +i3c_bus_normaluse_unlock (&m->bus); +if (ret) +return ret; + +i3c_bus_maintenance_lock (&m->bus); + ret =i3c_master_populate_bus (m, dyn_addr); +i3c_bus_maintenance_unlock (&m->bus); +if (!ret) { +i3c_bus_normaluse_lock (&m->bus); +i3c_master_register_new_i3c_devs (m); +i3c_bus_normaluse_unlock (&m->bus); + } +i3c_master_enable_mr_events (m); + +return ret; +} +EXPORT_SYMBOL_GPL (i3c_master_process_defslvs); +/** * i3c_master_unregister() - unregister an I3C master * @master: master used to send frames on the bus
include/linux/i3c/master.h +7 -0
@@ -471,6 +471,8 @@ struct i3c_master_controller_ops {* in a thread context. Typical examples are Hot Join processing which * requires taking the bus lock in maintenance, which in turn, can only * be done from a sleep-able context +* @defslvs_data: list used to pass i3c device list received in DEFSLVS message, +* from DEFSLVS controller driver to I3C core * * A &struct i3c_master_controller has to be registered to the I3C subsystem * through i3c_master_register(). None of &struct i3c_master_controller fields
@@ -490,6 +492,10 @@ struct i3c_master_controller { } boardinfo;struct i3c_bus bus;struct workqueue_struct *wq; +struct { +u32 ndevs; +struct i3c_ccc_dev_desc *devs; + } defslvs_data; };/**
@@ -516,6 +522,7 @@ struct i3c_master_controller {void i3c_master_yield_bus (struct i3c_master_controller *m,u8 sec_mst_dyn_addr); +int i3c_master_process_defslvs (struct i3c_master_controller *m,u8 dyn_addr);int i3c_master_do_i2c_xfers (struct i3c_master_controller *master,const struct i2c_msg *xfers,int nxfers);
Signature · 7 lines
2.17.1 _______________________________________________ linux-i3c mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-i3c
PATCH v8 6/7 i3c: master: sysfs key for acquire bus
In reply to Parshuram ThombareAdded support to acquire I3C bus through sysfs interface.
--- drivers/i3c/master.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/i3c/master.c +18 -0
@@ -596,6 +596,23 @@ static ssize_t i2c_scl_frequency_show(struct device *dev, }static DEVICE_ATTR_RO (i2c_scl_frequency); +static ssize_t i3c_acquire_bus_store (struct device *dev, +struct device_attribute *attr, +const char *buf,size_t count) +{ +struct i3c_master_controller *master =dev_to_i3cmaster (dev); +int ret; + +i3c_bus_normaluse_lock (&master->bus); + ret =i3c_master_acquire_bus (master); +i3c_bus_normaluse_unlock (&master->bus); +if (!ret) +i3c_master_enable_mr_events (master); + +return ret ?: count; +} +static DEVICE_ATTR_WO (i3c_acquire_bus); +static struct attribute *i3c_masterdev_attrs[] = { &dev_attr_mode.attr, &dev_attr_current_master.attr,
@@ -606,6 +623,7 @@ static struct attribute *i3c_masterdev_attrs[] = { &dev_attr_pid.attr, &dev_attr_dynamic_address.attr, &dev_attr_hdrcap.attr, + &dev_attr_i3c_acquire_bus.attr,NULL , };ATTRIBUTE_GROUPS (i3c_masterdev);
Signature · 7 lines
2.17.1 _______________________________________________ linux-i3c mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-i3c
PATCH v8 7/7 i3c: master: mastership handover, defslvs processing in cdns controller driver
In reply to Parshuram ThombareAdded I3C bus mastership handover and DEFSLVS message handling code to Cadence's I3C master controller driver.
--- drivers/i3c/master/i3c-master-cdns.c | 329 +++++++++++++++++++++++++-- 1 file changed, 306 insertions(+), 23 deletions(-)
drivers/i3c/master/i3c-master-cdns.c +306 -23
@@ -157,6 +157,7 @@#define SLV_IMR 0x48#define SLV_ICR 0x4c#define SLV_ISR 0x50 +#define SLV_INT_DEFSLVS BIT(21)#define SLV_INT_TM BIT(20)#define SLV_INT_ERROR BIT(19)#define SLV_INT_EVENT_UP BIT(18)
@@ -189,7 +190,7 @@#define SLV_STATUS1_HJ_DIS BIT(18)#define SLV_STATUS1_MR_DIS BIT(17)#define SLV_STATUS1_PROT_ERR BIT(16) -#define SLV_STATUS1_DA (x) (((s) & GENMASK(15, 9)) >> 9) +#define SLV_STATUS1_DA (s) (((s) & GENMASK(15, 9)) >> 9)#define SLV_STATUS1_HAS_DA BIT(8)#define SLV_STATUS1_DDR_RX_FULL BIT(7)#define SLV_STATUS1_DDR_TX_FULL BIT(6)
@@ -390,6 +391,9 @@ struct cdns_i3c_xfer {struct cdns_i3c_master {struct work_struct hj_work; +struct work_struct mr_yield_work; +struct work_struct defslvs_work; +struct completion mr_done;struct i3c_master_controller base;u32 free_rr_slots;unsigned int maxdevs;
@@ -408,6 +412,7 @@ struct cdns_i3c_master {struct clk *pclk;struct cdns_i3c_master_caps caps;unsigned long i3c_scl_lim; +u8 mr_addr; }; static inline struct cdns_i3c_master *
@@ -1187,10 +1192,6 @@ static int cdns_i3c_master_do_daa(struct i3c_master_controller *m)cdns_i3c_master_upd_i3c_scl_lim (master); -/* Unmask Hot-Join and Mastership request interrupts. */ -i3c_master_enec_locked (m,I3C_BROADCAST_ADDR , -I3C_CCC_EVENT_HJ |I3C_CCC_EVENT_MR ); -return 0 ; }
@@ -1199,21 +1200,21 @@ static int cdns_i3c_master_bus_init(struct i3c_master_controller *m)struct cdns_i3c_master *master =to_cdns_i3c_master (m);unsigned long pres_step, sysclk_rate, max_i2cfreq;struct i3c_bus *bus =i3c_master_get_bus (m); -u32 ctrl, prescl0, prescl1, pres, low; +u32 ctrl, prescl0, prescl1, pres, low, bus_mode;struct i3c_device_info info = { };int ret, ncycles;switch (bus->mode) {case I3C_BUS_MODE_PURE : - ctrl =CTRL_PURE_BUS_MODE ; + bus_mode =CTRL_PURE_BUS_MODE ;break ;case I3C_BUS_MODE_MIXED_FAST : - ctrl =CTRL_MIXED_FAST_BUS_MODE ; + bus_mode =CTRL_MIXED_FAST_BUS_MODE ;break ;case I3C_BUS_MODE_MIXED_SLOW : - ctrl =CTRL_MIXED_SLOW_BUS_MODE ; + bus_mode =CTRL_MIXED_SLOW_BUS_MODE ;break ;default :
@@ -1244,7 +1245,6 @@ static int cdns_i3c_master_bus_init(struct i3c_master_controller *m) bus->scl_rate.i2c = sysclk_rate / ((pres +1 ) *5 ); prescl0 |=PRESCL_CTRL0_I2C (pres); -writel (prescl0, master->regs +PRESCL_CTRL0 );/* Calculate OD and PP low. */ pres_step =1000000000 / (bus->scl_rate.i3c *4 );
@@ -1252,7 +1252,6 @@ static int cdns_i3c_master_bus_init(struct i3c_master_controller *m)if (ncycles <0 ) ncycles =0 ; prescl1 =PRESCL_CTRL1_OD_LOW (ncycles); -writel (prescl1, master->regs +PRESCL_CTRL1 );/* Get an address for the master. */ ret =i3c_master_get_free_addr (m,0 );
@@ -1270,13 +1269,21 @@ static int cdns_i3c_master_bus_init(struct i3c_master_controller *m)if (ret)return ret; + ctrl =readl (master->regs +CTRL ); +if (ctrl &CTRL_DEV_EN ) +cdns_i3c_master_disable (master); +writel (prescl0, master->regs +PRESCL_CTRL0 ); +writel (prescl1, master->regs +PRESCL_CTRL1 ); + ctrl &= ~CTRL_BUS_MODE_MASK ; + ctrl |= bus_mode |CTRL_HALT_EN |CTRL_MCS_EN ;/* * Enable Hot-Join, and, when a Hot-Join request happens, disable all * events coming from this device. * * We will issue ENTDAA afterwards from the threaded IRQ handler. */ - ctrl |=CTRL_HJ_ACK |CTRL_HJ_DISEC |CTRL_HALT_EN |CTRL_MCS_EN ; +if (!m->secondary) + ctrl |=CTRL_HJ_ACK |CTRL_HJ_DISEC ;writel (ctrl, master->regs +CTRL );cdns_i3c_master_enable (master);
@@ -1340,6 +1347,7 @@ static void cdns_i3c_master_handle_ibi(struct cdns_i3c_master *master,static void cnds_i3c_master_demux_ibis (struct cdns_i3c_master *master) { +struct i3c_dev_desc *dev;u32 status0;writel (MST_INT_IBIR_THR , master->regs +MST_ICR );
@@ -1361,6 +1369,14 @@ static void cnds_i3c_master_demux_ibis(struct cdns_i3c_master *master)case IBIR_TYPE_MR :WARN_ON (IBIR_XFER_BYTES (ibir) || (ibir &IBIR_ERROR )); +if (ibir &IBIR_ACKED ) { + dev = master->ibi.slots[IBIR_SLVID (ibir)]; + master->mr_addr = dev->info.dyn_addr; +queue_work (master->base.wq, + &master->mr_yield_work); + } +break ; +default :break ; }
@@ -1372,16 +1388,42 @@ static irqreturn_t cdns_i3c_master_interrupt(int irq, void *data)struct cdns_i3c_master *master = data;u32 status; - status =readl (master->regs +MST_ISR ); -if (!(status &readl (master->regs +MST_IMR ))) -return IRQ_NONE ; +if (master->base.this && + master->base.this == master->base.bus.cur_master) { + status =readl (master->regs +MST_ISR ); +if (!(status &readl (master->regs +MST_IMR ))) +return IRQ_NONE ; + +spin_lock (&master->xferqueue.lock); +cdns_i3c_master_end_xfer_locked (master, status); +spin_unlock (&master->xferqueue.lock); + +if (status &MST_INT_IBIR_THR ) +cnds_i3c_master_demux_ibis (master); + +if (status &MST_INT_MR_DONE ) { +writel (FLUSH_RX_FIFO |FLUSH_TX_FIFO , + master->regs +FLUSH_CTRL ); +writel (MST_INT_MR_DONE , master->regs +MST_ICR ); + } + }else { + status = (readl (master->regs +SLV_ISR ) & +readl (master->regs +SLV_IMR )); + +if (!status) +return IRQ_NONE ; + +if (status &SLV_INT_MR_DONE ) { +writel (FLUSH_RX_FIFO |FLUSH_TX_FIFO , + master->regs +FLUSH_CTRL ); +complete (&master->mr_done); + } -spin_lock (&master->xferqueue.lock); -cdns_i3c_master_end_xfer_locked (master, status); -spin_unlock (&master->xferqueue.lock); +if (status &SLV_INT_DEFSLVS ) +queue_work (master->base.wq, &master->defslvs_work); -if (status &MST_INT_IBIR_THR ) -cnds_i3c_master_demux_ibis (master); +writel (status, master->regs +SLV_ICR ); + }return IRQ_HANDLED ; }
@@ -1505,6 +1547,106 @@ static void cdns_i3c_master_recycle_ibi_slot(struct i3c_dev_desc *dev,i3c_generic_ibi_recycle_slot (data->ibi_pool, slot); } +static int cdns_i3c_master_find_ibi_slot (struct cdns_i3c_master *master, +struct i3c_dev_desc *dev, +s16 *slot) +{ +unsigned long flags; +unsigned int i; +int ret = -ENOENT ; + +spin_lock_irqsave (&master->ibi.lock, flags); +for (i =0 ; i < master->ibi.num_slots; i++) { +if (master->ibi.slots[i] == dev) { + *slot = i; + ret =0 ; +break ; + } + } + +if (ret) { +for (i =0 ; i < master->ibi.num_slots; i++) { +if (!master->ibi.slots[i]) { + master->ibi.slots[i] = dev; + *slot = i; + ret =0 ; +break ; + } + } + } +spin_unlock_irqrestore (&master->ibi.lock, flags); + +return ret; +} + +static int cdns_i3c_request_mastership (struct i3c_master_controller *m) +{ +struct cdns_i3c_master *master =to_cdns_i3c_master (m); +int status; + + status =readl (master->regs +MST_STATUS0 ); +if (status &MST_STATUS0_MASTER_MODE ) +return 0 ; + + status =readl (master->regs +SLV_STATUS1 ); +if (!(status &SLV_STATUS1_HAS_DA )) +return -EACCES ; + +if (status &SLV_STATUS1_MR_DIS ) +return -EACCES ; + +writel (readl (master->regs +CTRL ) |CTRL_MST_INIT |CTRL_MST_ACK , + master->regs +CTRL ); + +init_completion (&master->mr_done); +if (!wait_for_completion_timeout (&master->mr_done, +msecs_to_jiffies (1000 ))) +return -ETIMEDOUT ; + +return 0 ; +} + +static void +cdns_i3c_master_enable_mastership_events (struct i3c_master_controller *m) +{ +struct cdns_i3c_master *master =to_cdns_i3c_master (m); +struct cdns_i3c_i2c_dev_data *data; +struct i3c_dev_desc *i3cdev; +unsigned long flags; +u32 sircfg, sirmap; +int ret; + +i3c_bus_for_each_i3cdev (&m->bus, i3cdev) { +if (I3C_BCR_DEVICE_ROLE (i3cdev->info.bcr) != +I3C_BCR_I3C_MASTER || + m->this == i3cdev) +continue ; + + data =i3c_dev_get_master_data (i3cdev); +if (!data) +continue ; + + ret =cdns_i3c_master_find_ibi_slot (master, i3cdev, &data->ibi); +if (ret) +continue ; + +spin_lock_irqsave (&master->ibi.lock, flags); + sirmap =readl (master->regs +SIR_MAP_DEV_REG (data->ibi)); + sirmap &= ~SIR_MAP_DEV_CONF_MASK (data->ibi); + sircfg =SIR_MAP_DEV_ROLE (i3cdev->info.bcr >>6 ) | +SIR_MAP_DEV_DA (i3cdev->info.dyn_addr) | +SIR_MAP_DEV_PL (i3cdev->info.max_ibi_len) | +SIR_MAP_DEV_ACK ; + +if (i3cdev->info.bcr &I3C_BCR_MAX_DATA_SPEED_LIM ) + sircfg |=SIR_MAP_DEV_SLOW ; + + sirmap |=SIR_MAP_DEV_CONF (data->ibi, sircfg); +writel (sirmap, master->regs +SIR_MAP_DEV_REG (data->ibi)); +spin_unlock_irqrestore (&master->ibi.lock, flags); + } +} +static const struct i3c_master_controller_ops cdns_i3c_master_ops = { .bus_init = cdns_i3c_master_bus_init, .bus_cleanup = cdns_i3c_master_bus_cleanup,
@@ -1524,6 +1666,8 @@ static const struct i3c_master_controller_ops cdns_i3c_master_ops = { .request_ibi = cdns_i3c_master_request_ibi, .free_ibi = cdns_i3c_master_free_ibi, .recycle_ibi_slot = cdns_i3c_master_recycle_ibi_slot, + .request_mastership = cdns_i3c_request_mastership, + .enable_mr_events = cdns_i3c_master_enable_mastership_events, };static void cdns_i3c_master_hj (struct work_struct *work)
@@ -1535,10 +1679,135 @@ static void cdns_i3c_master_hj(struct work_struct *work)i3c_master_do_daa (&master->base); } +static void cdns_i3c_master_yield (struct work_struct *work) +{ +struct cdns_i3c_master *master =container_of (work, + struct cdns_i3c_master, + mr_yield_work); + +i3c_master_yield_bus (&master->base, master->mr_addr); +} + +static void cdns_i3c_sec_master_defslvs (struct work_struct *work) +{ +struct cdns_i3c_master *master =container_of (work, + struct cdns_i3c_master, + defslvs_work); +struct i3c_master_controller *m = &master->base; +struct i3c_ccc_dev_desc *desc; +struct cdns_i3c_i2c_dev_data *data; +struct i2c_dev_desc *i2cdev; +u32 devs, val, rr, slot; +u32 r0, r1, r2; +u8 saddr; + + devs =readl (master->regs +DEVS_CTRL ) &DEVS_CTRL_DEVS_ACTIVE_MASK ; + master->free_rr_slots =GENMASK (master->maxdevs,1 ) & ~devs; + +/* +* We chose to ignore I2C devices received from +* main master and use I2C device info from boardinfo. +* Since I2C device from boardinfo are already +* registered during bus_init, we just use same slot +* and if any I3C device is received in DEFSLVS in that +* place, just move that I3C device to other free slot. +* If there is no free slot, then such I3C devices +* are ignored. +* Master controller driver can chose how to handle I2C +* devices in DEFSLVS and pass only I3C devices list to +* I3C core DEFSVLS processing to handle hotplug and +* I3C device address changes. +*/ +for (slot =0 ; slot < master->maxdevs; slot++) { +if (!(devs &BIT (slot))) +continue ; + + val =readl (master->regs +DEV_ID_RR0 (slot)); +if (!(val &DEV_ID_RR0_IS_I3C )) { +writel (readl (master->regs +DEVS_CTRL ) | +DEVS_CTRL_DEV_CLR (slot), + master->regs +DEVS_CTRL ); + master->free_rr_slots |=BIT (slot); + } + } + + val =0 ; + devs =readl (master->regs +DEVS_CTRL ) &DEVS_CTRL_DEVS_ACTIVE_MASK ; +i3c_bus_for_each_i2cdev (&m->bus, i2cdev) { + data =i2c_dev_get_master_data (i2cdev); +if (devs &BIT (data->id)) { + rr =readl (master->regs +DEV_ID_RR0 (data->id)); + saddr =DEV_ID_RR0_GET_DEV_ADDR (rr); +if (saddr != i2cdev->boardinfo->base.addr) { + r0 =readl (master->regs +DEV_ID_RR0 (data->id)); + r1 =readl (master->regs +DEV_ID_RR1 (data->id)); + r2 =readl (master->regs +DEV_ID_RR2 (data->id)); + slot =ffs (master->free_rr_slots) -1 ; +if (slot >0 ) { +writel (r0, + master->regs +DEV_ID_RR0 (slot)); +writel (r1, + master->regs +DEV_ID_RR1 (slot)); +writel (r2, + master->regs +DEV_ID_RR2 (slot)); +writel (readl (master->regs +DEVS_CTRL ) | +DEVS_CTRL_DEV_ACTIVE (slot), + master->regs +DEVS_CTRL ); + master->free_rr_slots &= ~BIT (slot); + } + }else { +continue ; + } + } +writel (readl (master->regs +DEVS_CTRL ) | +DEVS_CTRL_DEV_CLR (data->id), + master->regs +DEVS_CTRL ); +writel (readl (master->regs +DEVS_CTRL ) | +DEVS_CTRL_DEV_ACTIVE (data->id), + master->regs +DEVS_CTRL ); +writel (prepare_rr0_dev_address (i2cdev->boardinfo->base.addr) | + (i2cdev->boardinfo->base.flags &I2C_CLIENT_TEN ? +DEV_ID_RR0_LVR_EXT_ADDR :0 ), + master->regs +DEV_ID_RR0 (data->id)); +writel (i2cdev->boardinfo->lvr, + master->regs +DEV_ID_RR2 (data->id)); + master->free_rr_slots &= ~BIT (data->id); + } + + master->base.defslvs_data.ndevs =0 ; + desc = master->base.defslvs_data.devs; + devs =readl (master->regs +DEVS_CTRL ) &DEVS_CTRL_DEVS_ACTIVE_MASK ; + +for (slot =0 ; slot < master->maxdevs; slot++) { +if (!(devs &BIT (slot))) +continue ; + + val =readl (master->regs +DEV_ID_RR0 (slot)); +if (val &DEV_ID_RR0_IS_I3C ) { +memset (desc,0 ,sizeof (struct i3c_ccc_dev_desc )); + rr =readl (master->regs +DEV_ID_RR0 (slot)); + desc->dyn_addr =DEV_ID_RR0_GET_DEV_ADDR (rr); + rr =readl (master->regs +DEV_ID_RR2 (slot)); + desc->dcr = rr; + desc->bcr = rr >>8 ; + master->base.defslvs_data.ndevs++; + desc++; + } + } + + val =readl (master->regs +SLV_STATUS1 ); +if (!(val &SLV_STATUS1_HAS_DA ) || +i3c_master_process_defslvs (m,SLV_STATUS1_DA (val))) { +queue_work (master->base.wq, work); +return ; + } +} +static int cdns_i3c_master_probe (struct platform_device *pdev) {struct cdns_i3c_master *master;struct resource *res; +bool secondary;int ret, irq;u32 val;
@@ -1579,6 +1848,7 @@ static int cdns_i3c_master_probe(struct platform_device *pdev)spin_lock_init (&master->xferqueue.lock);INIT_LIST_HEAD (&master->xferqueue.list); +INIT_WORK (&master->mr_yield_work, cdns_i3c_master_yield);INIT_WORK (&master->hj_work, cdns_i3c_master_hj);writel (0xffffffff , master->regs +MST_IDR );writel (0xffffffff , master->regs +SLV_IDR );
@@ -1590,6 +1860,7 @@ static int cdns_i3c_master_probe(struct platform_device *pdev)platform_set_drvdata (pdev, master); val =readl (master->regs +CONF_STATUS0 ); + secondary = (val &CONF_STATUS0_SEC_MASTER ) ? true : false;/* Device ID0 is reserved to describe this master. */ master->maxdevs =CONF_STATUS0_DEVS_NUM (val);
@@ -1610,12 +1881,24 @@ static int cdns_i3c_master_probe(struct platform_device *pdev)if (!master->ibi.slots) goto err_disable_sysclk; +if (secondary) +INIT_WORK (&master->defslvs_work, cdns_i3c_sec_master_defslvs); +writel (IBIR_THR (1 ), master->regs +CMD_IBI_THR_CTRL ); -writel (MST_INT_IBIR_THR , master->regs +MST_IER ); +writel (MST_INT_IBIR_THR |MST_INT_MR_DONE , master->regs +MST_IER );writel (DEVS_CTRL_DEV_CLR_ALL , master->regs +DEVS_CTRL ); - ret =i3c_primary_master_register (&master->base, &pdev->dev, - &cdns_i3c_master_ops); +if (secondary) { + ret =i3c_secondary_master_register (&master->base, &pdev->dev, + &cdns_i3c_master_ops); +if (!ret) +writel (SLV_INT_DEFSLVS |SLV_INT_MR_DONE , + master->regs +SLV_IER ); + }else { + ret =i3c_primary_master_register (&master->base, &pdev->dev, + &cdns_i3c_master_ops); + } +if (ret) goto err_disable_sysclk;
Signature · 7 lines
2.17.1 _______________________________________________ linux-i3c mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-i3c