| Message ID | 20191011150546.9186-3-tbogendoerfer@suse.de (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Paul Burton |
| Headers | show |
| Series | None | expand |
On 10/11/2019 11:05, Thomas Bogendoerfer wrote: > Use of provided plat_read/plat_write introduces the problem of possible > different lifetime of rtc driver and plat_XXX function provider. As > this was only intended for SGI Octane (IP30) this patchset implements > a register indirect access method for IP30 and introduces an > access_type field in platform data to select how registers are > accessed. And since there are no resource allocating stunts needed > anymore it also gets rid of alloc_io_resources from platform data. > Actually, I did it this way because IP32 was already in-tree, and IP30 was not. So the default ds1685_{read,write} functions were geared for the in-tree machine, and IP30 brought along its own versions. If IP30 support gets merged into the kernel, this isn't needed anymore, but I don't think this explanation accurately captures that. The chief difference between IP32 and IP30's manner of accessing the RTC is that IP32 has a 256-byte gap between each RTC register for unknown reasons (this is documented in the IP32 hardware data sheets I have), and access has to be MMIO'ed, since the RTC is hanging off of the MACE PCI structs, like every other device in IP32's code. IP30 doesn't have this register gap to worry about, and it accesses the RTC registers via PIO. > Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de> > --- > arch/mips/sgi-ip32/ip32-platform.c | 2 +- > drivers/rtc/rtc-ds1685.c | 67 ++++++++++++++++++++++++-------------- > include/linux/rtc/ds1685.h | 8 +++-- > 3 files changed, 48 insertions(+), 29 deletions(-) > > diff --git a/arch/mips/sgi-ip32/ip32-platform.c b/arch/mips/sgi-ip32/ip32-platform.c > index 5a2a82148d8d..c3909bd8dd1a 100644 > --- a/arch/mips/sgi-ip32/ip32-platform.c > +++ b/arch/mips/sgi-ip32/ip32-platform.c > @@ -115,7 +115,7 @@ ip32_rtc_platform_data[] = { > .bcd_mode = true, > .no_irq = false, > .uie_unsupported = false, > - .alloc_io_resources = true, > + .access_type = ds1685_reg_direct, > .plat_prepare_poweroff = ip32_prepare_poweroff, > }, > }; > diff --git a/drivers/rtc/rtc-ds1685.c b/drivers/rtc/rtc-ds1685.c > index 349a8d1caca1..9c5d064ebb6c 100644 > --- a/drivers/rtc/rtc-ds1685.c > +++ b/drivers/rtc/rtc-ds1685.c > @@ -59,6 +59,32 @@ ds1685_write(struct ds1685_priv *rtc, int reg, u8 value) > } > /* ----------------------------------------------------------------------- */ > > +/* Indirect read/write functions */ > + > +/** > + * ds1685_indir_read - read a value from an rtc register. > + * @rtc: pointer to the ds1685 rtc structure. > + * @reg: the register address to read. > + */ > +static u8 > +ds1685_indir_read(struct ds1685_priv *rtc, int reg) > +{ > + writeb(reg, rtc->regs); > + return readb(rtc->data); > +} > + > +/** > + * ds1685_indir_write - write a value to an rtc register. > + * @rtc: pointer to the ds1685 rtc structure. > + * @reg: the register address to write. > + * @value: value to write to the register. > + */ > +static void > +ds1685_indir_write(struct ds1685_priv *rtc, int reg, u8 value) > +{ > + writeb(reg, rtc->regs); > + writeb(value, rtc->data); > +} IP30 applied a mask of 0x7f on the 'reg' parameter on both of its read/write functions, which was from Stan's original code. Is this mask not needed any more with the other changes you made to the IP30 code? I remember trying to do without this mask once long ago, and something broke, so I have left it in ever since. > > /* ----------------------------------------------------------------------- */ > /* Inlined functions */ > @@ -1062,16 +1088,25 @@ ds1685_rtc_probe(struct platform_device *pdev) > if (!rtc) > return -ENOMEM; > > - /* > - * Allocate/setup any IORESOURCE_MEM resources, if required. Not all > - * platforms put the RTC in an easy-access place. Like the SGI Octane, > - * which attaches the RTC to a "ByteBus", hooked to a SuperIO chip > - * that sits behind the IOC3 PCI metadevice. > - */ > - if (pdata->alloc_io_resources) { > + /* Setup resources and access functions */ > + switch (pdata->access_type) { > + case ds1685_reg_direct: > + rtc->regs = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(rtc->regs)) > + return PTR_ERR(rtc->regs); > + rtc->read = ds1685_read; > + rtc->write = ds1685_write; > + break; > + case ds1685_reg_indirect: > rtc->regs = devm_platform_ioremap_resource(pdev, 0); > if (IS_ERR(rtc->regs)) > return PTR_ERR(rtc->regs); > + rtc->data = devm_platform_ioremap_resource(pdev, 1); > + if (IS_ERR(rtc->data)) > + return PTR_ERR(rtc->data); > + rtc->read = ds1685_indir_read; > + rtc->write = ds1685_indir_write; > + break; > } I believe there should be a default case in the switch statement to catch and return -ENXIO so that we don't wind up with rtc->{read,write} being NULL. I also think the "indir" name isn't really descriptive of why IP32 and IP30 effectively have different read/write mechanisms. Might want to add some comments to explain that IP32 uses MMIO and can just directly read/write the registers, while IP30 uses PIO and has to go the route of writing to an 'addr' register, then reading the result from a 'data' register. > > /* Get the register step size. */ > @@ -1080,24 +1115,6 @@ ds1685_rtc_probe(struct platform_device *pdev) > else > rtc->regstep = 1; > > - /* Platform read function, else default if mmio setup */ > - if (pdata->plat_read) > - rtc->read = pdata->plat_read; > - else > - if (pdata->alloc_io_resources) > - rtc->read = ds1685_read; > - else > - return -ENXIO; > - > - /* Platform write function, else default if mmio setup */ > - if (pdata->plat_write) > - rtc->write = pdata->plat_write; > - else > - if (pdata->alloc_io_resources) > - rtc->write = ds1685_write; > - else > - return -ENXIO; > - > /* Platform pre-shutdown function, if defined. */ > if (pdata->plat_prepare_poweroff) > rtc->prepare_poweroff = pdata->plat_prepare_poweroff; > diff --git a/include/linux/rtc/ds1685.h b/include/linux/rtc/ds1685.h > index 101c7adc05a2..67ee9d20cc5a 100644 > --- a/include/linux/rtc/ds1685.h > +++ b/include/linux/rtc/ds1685.h > @@ -42,6 +42,7 @@ > struct ds1685_priv { > struct rtc_device *dev; > void __iomem *regs; > + void __iomem *data; > u32 regstep; > int irq_num; > bool bcd_mode; > @@ -70,12 +71,13 @@ struct ds1685_rtc_platform_data { > const bool bcd_mode; > const bool no_irq; > const bool uie_unsupported; > - const bool alloc_io_resources; > - u8 (*plat_read)(struct ds1685_priv *, int); > - void (*plat_write)(struct ds1685_priv *, int, u8); > void (*plat_prepare_poweroff)(void); > void (*plat_wake_alarm)(void); > void (*plat_post_ram_clear)(void); > + enum { > + ds1685_reg_direct, > + ds1685_reg_indirect > + } access_type; > }; > > > -- 2.16.4
On Sat, 12 Oct 2019 19:22:01 -0400 Joshua Kinard <kumba@gentoo.org> wrote: > On 10/11/2019 11:05, Thomas Bogendoerfer wrote: > > +static void > > +ds1685_indir_write(struct ds1685_priv *rtc, int reg, u8 value) > > +{ > > + writeb(reg, rtc->regs); > > + writeb(value, rtc->data); > > +} > > IP30 applied a mask of 0x7f on the 'reg' parameter on both of its > read/write functions, which was from Stan's original code. Is this mask > not needed any more with the other changes you made to the IP30 code? reg is always < 0x80, so I didn't see a point in masking it. > > + switch (pdata->access_type) { > > + case ds1685_reg_direct: > > + rtc->regs = devm_platform_ioremap_resource(pdev, 0); > > + if (IS_ERR(rtc->regs)) > > + return PTR_ERR(rtc->regs); > > + rtc->read = ds1685_read; > > + rtc->write = ds1685_write; > > + break; > > + case ds1685_reg_indirect: > > rtc->regs = devm_platform_ioremap_resource(pdev, 0); > > if (IS_ERR(rtc->regs)) > > return PTR_ERR(rtc->regs); > > + rtc->data = devm_platform_ioremap_resource(pdev, 1); > > + if (IS_ERR(rtc->data)) > > + return PTR_ERR(rtc->data); > > + rtc->read = ds1685_indir_read; > > + rtc->write = ds1685_indir_write; > > + break; > > } > > I believe there should be a default case in the switch statement to catch > and return -ENXIO so that we don't wind up with rtc->{read,write} being > NULL. access_type is an enum and all possible values are covered with cases. But I'll add a safe guart to check that read/write is set to cover garbled platform_data. If you want to keep plat_read/plat_write I could add an additional access_type (which could also be done later, when there is a real use case). > I also think the "indir" name isn't really descriptive of why IP32 and > IP30 effectively have different read/write mechanisms. IP32 accesses register directly and IP30 indirectly via an address register. I'll use indirect in function name and some comment to explain. > Might want to add > some comments to explain that IP32 uses MMIO and can just directly > read/write the registers, while IP30 uses PIO and has to go the route of what's PIO here for you ? RTC address and data register are mapped MMIO as part of the IOC3 register bar on IP30. Thomas.
diff --git a/arch/mips/sgi-ip32/ip32-platform.c b/arch/mips/sgi-ip32/ip32-platform.c index 5a2a82148d8d..c3909bd8dd1a 100644 --- a/arch/mips/sgi-ip32/ip32-platform.c +++ b/arch/mips/sgi-ip32/ip32-platform.c @@ -115,7 +115,7 @@ ip32_rtc_platform_data[] = { .bcd_mode = true, .no_irq = false, .uie_unsupported = false, - .alloc_io_resources = true, + .access_type = ds1685_reg_direct, .plat_prepare_poweroff = ip32_prepare_poweroff, }, }; diff --git a/drivers/rtc/rtc-ds1685.c b/drivers/rtc/rtc-ds1685.c index 349a8d1caca1..9c5d064ebb6c 100644 --- a/drivers/rtc/rtc-ds1685.c +++ b/drivers/rtc/rtc-ds1685.c @@ -59,6 +59,32 @@ ds1685_write(struct ds1685_priv *rtc, int reg, u8 value) } /* ----------------------------------------------------------------------- */ +/* Indirect read/write functions */ + +/** + * ds1685_indir_read - read a value from an rtc register. + * @rtc: pointer to the ds1685 rtc structure. + * @reg: the register address to read. + */ +static u8 +ds1685_indir_read(struct ds1685_priv *rtc, int reg) +{ + writeb(reg, rtc->regs); + return readb(rtc->data); +} + +/** + * ds1685_indir_write - write a value to an rtc register. + * @rtc: pointer to the ds1685 rtc structure. + * @reg: the register address to write. + * @value: value to write to the register. + */ +static void +ds1685_indir_write(struct ds1685_priv *rtc, int reg, u8 value) +{ + writeb(reg, rtc->regs); + writeb(value, rtc->data); +} /* ----------------------------------------------------------------------- */ /* Inlined functions */ @@ -1062,16 +1088,25 @@ ds1685_rtc_probe(struct platform_device *pdev) if (!rtc) return -ENOMEM; - /* - * Allocate/setup any IORESOURCE_MEM resources, if required. Not all - * platforms put the RTC in an easy-access place. Like the SGI Octane, - * which attaches the RTC to a "ByteBus", hooked to a SuperIO chip - * that sits behind the IOC3 PCI metadevice. - */ - if (pdata->alloc_io_resources) { + /* Setup resources and access functions */ + switch (pdata->access_type) { + case ds1685_reg_direct: + rtc->regs = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(rtc->regs)) + return PTR_ERR(rtc->regs); + rtc->read = ds1685_read; + rtc->write = ds1685_write; + break; + case ds1685_reg_indirect: rtc->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(rtc->regs)) return PTR_ERR(rtc->regs); + rtc->data = devm_platform_ioremap_resource(pdev, 1); + if (IS_ERR(rtc->data)) + return PTR_ERR(rtc->data); + rtc->read = ds1685_indir_read; + rtc->write = ds1685_indir_write; + break; } /* Get the register step size. */ @@ -1080,24 +1115,6 @@ ds1685_rtc_probe(struct platform_device *pdev) else rtc->regstep = 1; - /* Platform read function, else default if mmio setup */ - if (pdata->plat_read) - rtc->read = pdata->plat_read; - else - if (pdata->alloc_io_resources) - rtc->read = ds1685_read; - else - return -ENXIO; - - /* Platform write function, else default if mmio setup */ - if (pdata->plat_write) - rtc->write = pdata->plat_write; - else - if (pdata->alloc_io_resources) - rtc->write = ds1685_write; - else - return -ENXIO; - /* Platform pre-shutdown function, if defined. */ if (pdata->plat_prepare_poweroff) rtc->prepare_poweroff = pdata->plat_prepare_poweroff; diff --git a/include/linux/rtc/ds1685.h b/include/linux/rtc/ds1685.h index 101c7adc05a2..67ee9d20cc5a 100644 --- a/include/linux/rtc/ds1685.h +++ b/include/linux/rtc/ds1685.h @@ -42,6 +42,7 @@ struct ds1685_priv { struct rtc_device *dev; void __iomem *regs; + void __iomem *data; u32 regstep; int irq_num; bool bcd_mode; @@ -70,12 +71,13 @@ struct ds1685_rtc_platform_data { const bool bcd_mode; const bool no_irq; const bool uie_unsupported; - const bool alloc_io_resources; - u8 (*plat_read)(struct ds1685_priv *, int); - void (*plat_write)(struct ds1685_priv *, int, u8); void (*plat_prepare_poweroff)(void); void (*plat_wake_alarm)(void); void (*plat_post_ram_clear)(void); + enum { + ds1685_reg_direct, + ds1685_reg_indirect + } access_type; };
Use of provided plat_read/plat_write introduces the problem of possible different lifetime of rtc driver and plat_XXX function provider. As this was only intended for SGI Octane (IP30) this patchset implements a register indirect access method for IP30 and introduces an access_type field in platform data to select how registers are accessed. And since there are no resource allocating stunts needed anymore it also gets rid of alloc_io_resources from platform data. Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de> --- arch/mips/sgi-ip32/ip32-platform.c | 2 +- drivers/rtc/rtc-ds1685.c | 67 ++++++++++++++++++++++++-------------- include/linux/rtc/ds1685.h | 8 +++-- 3 files changed, 48 insertions(+), 29 deletions(-)