Messages in this thread | | | Subject | Re: [PATCH 1/2] sh: dma: fix `dmaor_read_reg`/`dmaor_write_reg` macros | From | John Paul Adrian Glaubitz <> | Date | Wed, 10 May 2023 08:25:11 +0200 |
| |
On Sat, 2023-05-06 at 16:17 +0200, Artur Rojek wrote: > Squash two bugs introduced into said macros in 7f47c7189b3e, preventing > them from proper operation: > 1) Add DMAOR register offset into the address of the hw reg access, > 2) Correct a nasty typo in the DMAOR base calculation for > `dmaor_write_reg`. > > Signed-off-by: Artur Rojek <contact@artur-rojek.eu> > --- > arch/sh/drivers/dma/dma-sh.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/arch/sh/drivers/dma/dma-sh.c b/arch/sh/drivers/dma/dma-sh.c > index 96c626c2cd0a..14c18ebda400 100644 > --- a/arch/sh/drivers/dma/dma-sh.c > +++ b/arch/sh/drivers/dma/dma-sh.c > @@ -254,8 +254,11 @@ static int sh_dmac_get_dma_residue(struct dma_channel *chan) > * DMAOR bases are broken out amongst channel groups. DMAOR0 manages > * channels 0 - 5, DMAOR1 6 - 11 (optional). > */ > -#define dmaor_read_reg(n) __raw_readw(dma_find_base((n)*6)) > -#define dmaor_write_reg(n, data) __raw_writew(data, dma_find_base(n)*6) > +#define dmaor_read_reg(n) __raw_readw(dma_find_base((n) * 6) + \ > + DMAOR) > +#define dmaor_write_reg(n, data) __raw_writew(data, \ > + dma_find_base((n) * 6) + \ > + DMAOR) > > static inline int dmaor_reset(int no) > {
Reviewed-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
-- .''`. John Paul Adrian Glaubitz : :' : Debian Developer `. `' Physicist `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
| |