Em Wed, 12 Aug 2020 09:43:53 +0100 Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> escreveu: > On Wed, 12 Aug 2020 09:45:40 +0200 > Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx> wrote: > > > > > > This is mixing and matching managed an unmanaged. Should be one or the other > > > or we might be hiding some race conditions. > > I intended this as a more localized comment, though the following answers > another question I had. > > request_threaded_irq is not using devm_ whilst the add devices is. > As a result we might have a path in which the irq goes away before > the device cleanup happens. Ah, good point! I'll address it. > > Actually, it is just the opposite. It took me a lot of time to > > figure out a good solution that will prevent all race conditions at > > probe time. > > > > See, the SPMI variant of HiSilicon 6421 requires the drivers to be > > probed on a very specific order: > > > > - The SPMI controller should be loaded first, as it provides > > the low-level I/O access to the serial bus used to talk with the > > PMICs. This bus is somewhat similar to the I2C bus. > > > > Once the controller is registered, the SPMI bus probes the PMIC > > driver. > > > > - Then, the MFD PMIC driver should be loaded. This adds support for > > a high level set of I/O operations, which are used by the regulator > > driver. Again, this approach is similar to the one taken by the > > I2C Kernel drivers. > > > > - Finally, the regulator drivers should come, as they rely on the > > MFD I/O operations in order to talk with the SPMI bus. > > > > The OOT driver probing was based on a some dirty hacks: it had an > > empty SPMI entry at the SoC, carrying on just the "compatible" line. > > > > Then, another entry at DT with the real SPMI settings. > > > > With such dirty hack, on Kernel 4.9, the PMIC driver were always > > loading before the regulator ones, as the SPMI bus code were > > serializing the probe there. > > > > However, such settings were too fragile and broke after porting to > > upstream Kernels, because the regulator drivers were probed on > > a random order, typically before the MFD one (and sometimes even > > before the SPMI controller driver). Adding EPROBE_DEFER didn't > > solve all the issues, and made a complex and hard to debug scenario. > > Also, regulators were probed on a random order, making harder to > > debug issues there. > > There are no ordering guarantees IIRC in mfd children coming up even > in the normal path. It might currently happen in a particular order > but relying on that seems fragile to me. True, but in the case of SPMI controller and PMIC, there's no way to support them to be initialized on a random order. That's why the approach I took is serializing the probe. > > > > So, I ended using the same solution used by the already-existing > > drivers/mfd/hi6421-pmic-core.c driver[1]. > > > > [1] This variant of the 6421 chipset is a lot simpler, as it > > doesn't use the SPMI bus. > > > > With such approach, the probing is warranted to happen the > > way it is expected by the driver: > > > > SPMI controller code starts: > > [ 0.416862] spmi_controller fff24000.spmi: HISI SPMI probe > > [ 0.422419] spmi spmi-0: allocated controller 0x(____ptrval____) id 0 > > [ 0.428929] spmi_controller fff24000.spmi: spmi_add_controller base addr=0xffff800012055000! > > [ 0.437480] spmi spmi-0: adding child /spmi@fff24000/pmic@0 > > [ 0.443109] spmi spmi-0: read usid 00 > > [ 0.446821] spmi 2-00: device 2-00 registered > > [ 0.451220] spmi spmi-0: spmi-2 registered: dev:(____ptrval____) > > [ 0.457286] spmi_controller fff24000.spmi: spmi_add_controller initialized > > > > The PMIC probe happens sometime after spmi_controller registers itself > > at the SPMI bus: > > > > [ 1.955838] [hi6421_spmi_pmic_probe]. pmic->irqs[0] = 43 > > ... > > [ 2.036298] [hi6421_spmi_pmic_probe]. pmic->irqs[15] = 58 > > > > After being ready to handle I/O requests, it starts probing the > > regulators: > > > > [ 2.057815] hi6421v600-regulator hi6421v600-regulator: adding child /spmi@fff24000/pmic@0/regulators/ldo3@16 > > [ 2.199827] hi6421v600-regulator hi6421v600-regulator: adding child /spmi@fff24000/pmic@0/regulators/ldo4@17 > > [ 2.336284] hi6421v600-regulator hi6421v600-regulator: adding child /spmi@fff24000/pmic@0/regulators/ldo9@1C > > [ 2.472675] hi6421v600-regulator hi6421v600-regulator: adding child /spmi@fff24000/pmic@0/regulators/ldo15@21 > > [ 2.609402] hi6421v600-regulator hi6421v600-regulator: adding child /spmi@fff24000/pmic@0/regulators/ldo16@22 > > [ 2.746378] hi6421v600-regulator hi6421v600-regulator: adding child /spmi@fff24000/pmic@0/regulators/ldo17@23 > > [ 2.846707] hi6421v600-regulator hi6421v600-regulator: adding child /spmi@fff24000/pmic@0/regulators/ldo33@32 > > [ 2.988646] hi6421v600-regulator hi6421v600-regulator: adding child /spmi@fff24000/pmic@0/regulators/ldo34@33 > > > > As the current code serializes the regulator probing, it ensured that > > they'll happen at the right order, avoiding race conditions at > > probe time. > > Why do we need the regulators to come up in a particular order? > That sounds suspicious as any relationships between different ones should be expressed > either in DT or in the order they are enabled in the drivers using them. There's no need for them to come up on a particular order. What I meant to say is that the that the SPMI controller and MFD should go first. - Yet, incidentally, the current code also serializes the regulator probe. I could have written the code on a different way that would allow them to be probed in parallel, by moving a loop from the regulator driver to the PMIC one. However, I don't see any advantage on doing that, as the regulator initialization code ends calling the SPMI serial bus, whose access is already serialized by a spinlock. So, there's no performance gain by allowing them to be probed in parallel, as most of the regulator's probing time is probably waiting for the relatively slow I/O serial transfers to happen. Also, a nice a side effect of serializing the probe at the regulator driver is that the devices are ordered according their LDO numbers, and the debug logs from probing time will be altogether, helping to debug potential issues over there. > > > > +static int hi6421_spmi_regulator_set_voltage_sel(struct regulator_dev *rdev, > > > > + unsigned int selector) > > > > +{ > > > > + struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); > > > > + struct hi6421_spmi_pmic *pmic = sreg->pmic; > > > > + u32 reg_val; > > > > + > > > > + /* unlikely to happen. sanity test done by regulator core */ > > > > > > Unlikely or can't? > > > > > > > + if (unlikely(selector >= rdev->desc->n_voltages)) > > > > + return -EINVAL; > > > > Good question. I almost removed this check, but I didn't check the > > regulator code with enough care to be 100% sure. So, I opted to keep it > > here. > > I'd drop the comment then :) If someone else wants to figure it out > in future then they are welcome to. Ok. > > > > + if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) { > > > > + rdev_dbg(rdev, "normal mode"); > > > > > > Debug seems unnecessary to me, but maybe keep it if you want. > > > > I actually used this debug. There are some LDO lines which don't > > support eco mode. The original driver was hard to understand that. > > So, I ended by re-writing the part of the code which sets/uses it[1]: > > > > + /* hisi regulator supports two modes */ > > + constraint = &initdata->constraints; > > + > > + constraint->valid_modes_mask = REGULATOR_MODE_NORMAL; > > + if (sreg->eco_mode_mask) { > > + constraint->valid_modes_mask |= REGULATOR_MODE_IDLE; > > + constraint->valid_ops_mask |= REGULATOR_CHANGE_MODE; > > + } > > + > > > > [1] https://lore.kernel.org/lkml/176043f329dfa9889f014feec04e7e1553077873.1597160086.git.mchehab+huawei@xxxxxxxxxx/T/#m337e09adf04e4b8ce56af93ba37e3720b2a3002b > > > > Those debug messages are useful to double-check if something bad is > > not happening with the modes/ops masks. > > That's fine, but is it useful to have it upstream now you have debugged > those issues? I'm not completely convinced it is and debug prints have > a habit of rotting just like comments. Good point. I'll do a review at the printks inside the driver anyway. I'll try to cleanup some things that doesn't make much sense after having the driver working properly. Thanks, Mauro