Hi Arnd, On Wed, 11 Jul 2018 16:01:56 +0200 Arnd Bergmann <arnd@xxxxxxxx> wrote: > > > - the bus element is a separate object and is not implicitly described > > by the master (as done in I2C). The reason is that I want to be able > > to handle multiple master connected to the same bus and visible to > > Linux. > > In this situation, we should only have one instance of the device and > > not one per master, and sharing the bus object would be part of the > > solution to gracefully handle this case. > > I'm not sure we will ever need to deal with multiple masters > > controlling the same bus and exposed under Linux, but separating the > > bus and master concept is pretty easy, hence the decision to do it > > like that. > > The other benefit of separating the bus and master concepts is that > > master devices appear under the bus directory in sysfs. > > I'm not following here at all, sorry for missing prior discussion if this > was already explained. What is the "multiple master" case? Do you > mean multiple devices that are controlled by Linux and that each talk > to other devices on the same bus, multiple operating systems that > have talk to are able to own the bus with the kernel being one of > them, a controller that controls multiple independent buses, > or something else? I mean several masters connected to the same bus and all exposed to the same Linux instance. In this case, the question is, should we have X I3C buses exposed (X being the number of masters) or should we only have one? Having a bus represented as a separate object allows us to switch to the "one bus : X masters" representation if we need too. > > > +/** > > + * i3cdev_to_dev() - Returns the device embedded in @i3cdev > > + * @i3cdev: I3C device > > + * > > + * Return: a pointer to a device object. > > + */ > > +struct device *i3cdev_to_dev(struct i3c_device *i3cdev) > > +{ > > + return &i3cdev->dev; > > +} > > +EXPORT_SYMBOL_GPL(i3cdev_to_dev); > > + > > +/** > > + * dev_to_i3cdev() - Returns the I3C device containing @dev > > + * @dev: device object > > + * > > + * Return: a pointer to an I3C device object. > > + */ > > +struct i3c_device *dev_to_i3cdev(struct device *dev) > > +{ > > + return container_of(dev, struct i3c_device, dev); > > +} > > +EXPORT_SYMBOL_GPL(dev_to_i3cdev); > > Many other subsystems just make the device structure available > to all client drivers so this can be an inline operation. Is there > a strong reason to hide it here? No, but I think most subsystem do provide dev_to_xxxdev() at least (to_platform_device() for instance) > > > +static struct i3c_device * > > +i3c_master_alloc_i3c_dev(struct i3c_master_controller *master, > > + const struct i3c_device_info *info, > > + const struct device_type *devtype) > > +{ > > + struct i3c_device *dev; > > + > > + dev = kzalloc(sizeof(*dev), GFP_KERNEL); > > + if (!dev) > > + return ERR_PTR(-ENOMEM); > > + > > + dev->common.bus = master->bus; > > + dev->dev.parent = &master->bus->dev; > > + dev->dev.type = devtype; > > + dev->dev.bus = &i3c_bus_type; > > This feels a bit odd: so you have bus_type that can contain devices > of three (?) different device types: i3c_device_type, i3c_master_type > and i3c_busdev_type. > > Generally speaking, we don't have a lot of subsystems that even > use device_types. I assume that the i3c_device_type for a > device that corresponds to an endpoint on the bus, but I'm > still confused about the other two, and why they are part of > the same bus_type. i3c_busdev is just a virtual device representing the bus itself. i3c_master is representing the I3C master driving the bus. The reason for having a different type here is to avoid attaching this device to a driver but still being able to see the master controller as a device on the bus. And finally, i3c_device are all remote devices that can be accessed through a given i3c_master. This all comes from the design choice I made to represent the bus as a separate object in order to be able to share it between different master controllers exposed through the same Linux instance. Since master controllers are also remote devices for other controllers, we need to represent them. > > Can you describe whether it's possible to have these arbitrarily > mixed, or is there a strict hierarchy such as > > host_bus (e.g. platform_device) > i3c_busdev > i3c_master > i3c_device It's more: platdev i3c_busdev i3c_master i3c_device > > If that is the actual hierarchy, why isn't it enough to have multiple > masters as children of the platform_device, and then multiple > devices under each of them? Can you also have a platform_device > that controls multiple busdev instances, which each have multiple > masters? Not yet. But at some point, we may have the same i3c_busdev instance shared by several platdev, each of these platdev having an i3c_master instance on the bus. > > > +/** > > + * i3c_generic_ibi_alloc_pool() - Create a generic IBI pool > > + * @dev: the device this pool will be used for > > + * @req: IBI setup request describing what the device driver expects > > + * > > + * Create a generic IBI pool based on the information provided in @req. > > + * > > + * Return: a valid IBI pool in case of success, an ERR_PTR() otherwise. > > + */ > > +struct i3c_generic_ibi_pool * > > +i3c_generic_ibi_alloc_pool(struct i3c_device *dev, > > + const struct i3c_ibi_setup *req) > > +{ > > + struct i3c_generic_ibi_pool *pool; > > + struct i3c_generic_ibi_slot *slot; > > + unsigned int i; > > + int ret; > > + > > + pool = kzalloc(sizeof(*pool), GFP_KERNEL); > > + if (!pool) > > + return ERR_PTR(-ENOMEM); > > + > > + spin_lock_init(&pool->lock); > > + INIT_LIST_HEAD(&pool->free_slots); > > + INIT_LIST_HEAD(&pool->pending); > > + > > + for (i = 0; i < req->num_slots; i++) { > > + slot = kzalloc(sizeof(*slot), GFP_KERNEL); > > + if (!slot) > > + return ERR_PTR(-ENOMEM); > > + > > + i3c_master_init_ibi_slot(dev, &slot->base); > > + > > + if (req->max_payload_len) { > > + slot->base.data = kzalloc(req->max_payload_len, > > + GFP_KERNEL); > > You do a lot of allocations here, each with the same GFP_KERNEL > flag. Do the objects have different lifetimes, or could you combine > them into a larger allocation? I guess I could pack them to a single kcalloc(). > > Is this called frequently, or only while initializing a device? Only at IBI handler registration time, so normally only when probing an I3C device. > > > +/** > > + * struct i3c_ccc_mwl - payload passed to SETMWL/GETMWL CCC > > + * > > + * @len: maximum write length in bytes > > + * > > + * The maximum write length is only applicable to SDR private messages or > > + * extended Write CCCs (like SETXTIME). > > + */ > > +struct i3c_ccc_mwl { > > + __be16 len; > > +} __packed; > > I would suggest only marking structures as __packed that are not already > naturally packed. Note that a side-effect of __packed is that here > alignof(struct i3c_ccc_mwl) will be '1', and architectures without efficient > unaligned access will have to access the field one byte at a time because > they assume that it may be misaligned. These are structure used to create packets to be sent on the wire. Making sure that everything is packed correctly is important, so I'm not sure I can remove the __packed everywhere. > > > +/** > > + * struct i3c_ccc_mrl - payload passed to SETMRL/GETMRL CCC > > + * > > + * @len: maximum read length in bytes > > + * @ibi_len: maximum IBI payload length > > + * > > + * The maximum read length is only applicable to SDR private messages or > > + * extended Read CCCs (like GETXTIME). > > + * The IBI length is only valid if the I3C slave is IBI capable > > + * (%I3C_BCR_IBI_REQ_CAP is set). > > + */ > > +struct i3c_ccc_mrl { > > + __be16 read_len; > > + u8 ibi_len; > > +} __packed; > > This one clearly needs the __packed to get sizeof(struct i3c_ccc_mrl)==3 Yep, that's what I meant. > > > +/** > > + * struct i3c_ccc_cmd_payload - CCC payload > > + * > > + * @len: payload length > > + * @data: payload data > > + */ > > +struct i3c_ccc_cmd_payload { > > + u16 len; > > + void *data; > > +}; > > + > > +/** > > + * struct i3c_ccc_cmd_dest - CCC command destination > > + * > > + * @addr: can be an I3C device address or the broadcast address if this is a > > + * broadcast CCC > > + * @payload: payload to be sent to this device or broadcasted > > + */ > > +struct i3c_ccc_cmd_dest { > > + u8 addr; > > + struct i3c_ccc_cmd_payload payload; > > +}; > > There seems to be a lot of padding in this structure: on a 64-bit > machine, you have 11 bytes of data and 13 bytes of padding. > Not sure if that's intentional or important at all. I don't think that a big issue. > > > +/** > > + * struct i3c_ccc_cmd - CCC command > > + * > > + * @rnw: true if the CCC should retrieve data from the device. Only valid for > > + * unicast commands > > + * @id: CCC command id > > + * @dests: array of destinations and associated payload for this CCC. Most of > > + * the time, only one destination is provided > > + * @ndests: number of destinations. Should always be one for broadcast commands > > + */ > > +struct i3c_ccc_cmd { > > + bool rnw; > > + u8 id; > > + struct i3c_ccc_cmd_dest *dests; > > + int ndests; > > +}; > > Moving the 'ndests' above the pointer will make this structure 16 bytes instead > of 24 on 64-bit architectures. Okay. Will do. > > > +/** > > + * struct i3c_i2c_dev - I3C/I2C common information > > + * @node: node element used to insert the device into the I2C or I3C device > > + * list > > + * @bus: I3C bus this device is connected to > > + * @master: I3C master that instantiated this device. Will be used to send > > + * I2C/I3C frames on the bus > > + * @master_priv: master private data assigned to the device. Can be used to > > + * add master specific information > > + * > > + * This structure is describing common I3C/I2C dev information. > > + */ > > +struct i3c_i2c_dev { > > + struct list_head node; > > + struct i3c_bus *bus; > > + struct i3c_master_controller *master; > > + void *master_priv; > > +}; > > I find this hard to follow, which means either this has to be complicated > and I just didn't take enough time to think it through, or maybe it can > be simplified. > > The 'node' field seems particularly odd, can you explain what it's > for? Normally all children of a bus device can be enumerated by > walking the device model structures. Are you doing this just so > you can walk a single list rather than walking the i3c and i2c > devices separately? The devices discovered on the bus are not directly registered to the device model, and I need to store them in a list to do some operations before exposing them. Once everything is ready to be used, I then iterate the list and register all not-yet-registered I3C devs. > > > +/** > > + * struct i3c_bus - I3C bus object > > + * @dev: device to be registered to the device-model > > + * @cur_master: I3C master currently driving the bus. Since I3C is multi-master > > + * this can change over the time. Will be used to let a master > > + * know whether it needs to request bus ownership before sending > > + * a frame or not > > + * @id: bus ID. Assigned by the framework when register the bus > > + * @addrslots: a bitmap with 2-bits per-slot to encode the address status and > > + * ease the DAA (Dynamic Address Assignment) procedure (see > > + * &enum i3c_addr_slot_status) > > + * @mode: bus mode (see &enum i3c_bus_mode) > > + * @scl_rate: SCL signal rate for I3C and I2C mode > > + * @devs: 2 lists containing all I3C/I2C devices connected to the bus > > + * @lock: read/write lock on the bus. This is needed to protect against > > + * operations that have an impact on the whole bus and the devices > > + * connected to it. For example, when asking slaves to drop their > > + * dynamic address (RSTDAA CCC), we need to make sure no one is trying > > + * to send I3C frames to these devices. > > + * Note that this lock does not protect against concurrency between > > + * devices: several drivers can send different I3C/I2C frames through > > + * the same master in parallel. This is the responsibility of the > > + * master to guarantee that frames are actually sent sequentially and > > + * not interlaced > > + * > > + * The I3C bus is represented with its own object and not implicitly described > > + * by the I3C master to cope with the multi-master functionality, where one bus > > + * can be shared amongst several masters, each of them requesting bus ownership > > + * when they need to. > > + */ > > +struct i3c_bus { > > + struct device dev; > > + struct i3c_device *cur_master; > > + int id; > > + unsigned long addrslots[((I2C_MAX_ADDR + 1) * 2) / BITS_PER_LONG]; > > + enum i3c_bus_mode mode; > > + struct { > > + unsigned long i3c; > > + unsigned long i2c; > > + } scl_rate; > > + struct { > > + struct list_head i3c; > > + struct list_head i2c; > > + } devs; > > + struct rw_semaphore lock; > > +}; > > Now here you have two separate lists. How is the i3c list > different from i3c_bus->dev.p->klist_children? As said above, the I3C devs are not registered right away. We need to make sure the controller is configured properly before exposing them to the device model. > > How do you get to the i2c_adapter from an i3c_bus? Does > each master have one? Each master has an i2c_adapter, and I need an internal wrapper to keep track of I3C-bus-only information attached to an I2C device (like LVR). Yet another reason to have a separate list of I2C devices. The other reason being that I2C devices need to be attached to the I3C master controller before being exposed to the I2C framework, and more importantly, the I3C master controller needs to know about all I2C devices connected on the bus, at bus initialization time (so before the bus becomes active). I hope my explanations are clear enough. Don't hesitate to tell me if that's not the case, and thanks a lot for taking the time to review this patchset. Regards, Boris -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html