* Re: [PATCH v2 2/2] bus: mhi: Fix MHI DMA structure endianness
@ 2021-06-25 20:20 kernel test robot
0 siblings, 0 replies; 4+ messages in thread
From: kernel test robot @ 2021-06-25 20:20 UTC (permalink / raw)
To: kbuild
[-- Attachment #1: Type: text/plain, Size: 8921 bytes --]
CC: kbuild-all(a)lists.01.org
In-Reply-To: <20210623024327.15029-3-paul.davey@alliedtelesis.co.nz>
References: <20210623024327.15029-3-paul.davey@alliedtelesis.co.nz>
TO: Paul Davey <paul.davey@alliedtelesis.co.nz>
TO: Manivannan Sadhasivam <mani@kernel.org>
CC: linux-arm-msm(a)vger.kernel.org
CC: linux-kernel(a)vger.kernel.org
CC: Bhaumik Bhatt <bbhatt@codeaurora.org>
CC: Hemant Kumar <hemantk@codeaurora.org>
CC: Paul Davey <paul.davey@alliedtelesis.co.nz>
Hi Paul,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.13-rc7 next-20210625]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Paul-Davey/bus-mhi-Fix-MHI-on-big-endian-architectures/20210623-104355
base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 0c18f29aae7ce3dadd26d8ee3505d07cc982df75
:::::: branch date: 3 days ago
:::::: commit date: 3 days ago
config: parisc-randconfig-m031-20210625 (attached as .config)
compiler: hppa-linux-gcc (GCC) 9.3.0
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
smatch warnings:
drivers/bus/mhi/core/debugfs.c:74 mhi_debugfs_events_show() error: '%pad' expects argument of type 'dma_addr_t*', argument 4 has type 'ullong*'
drivers/bus/mhi/core/debugfs.c:122 mhi_debugfs_channels_show() error: '%pad' expects argument of type 'dma_addr_t*', argument 5 has type 'ullong*'
vim +74 drivers/bus/mhi/core/debugfs.c
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 37
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 38 static int mhi_debugfs_events_show(struct seq_file *m, void *d)
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 39 {
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 40 struct mhi_controller *mhi_cntrl = m->private;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 41 struct mhi_event *mhi_event;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 42 struct mhi_event_ctxt *er_ctxt;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 43 int i;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 44
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 45 if (!mhi_is_active(mhi_cntrl)) {
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 46 seq_puts(m, "Device not ready\n");
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 47 return -ENODEV;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 48 }
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 49
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 50 er_ctxt = mhi_cntrl->mhi_ctxt->er_ctxt;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 51 mhi_event = mhi_cntrl->mhi_event;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 52 for (i = 0; i < mhi_cntrl->total_ev_rings;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 53 i++, er_ctxt++, mhi_event++) {
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 54 struct mhi_ring *ring = &mhi_event->ring;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 55
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 56 if (mhi_event->offload_ev) {
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 57 seq_printf(m, "Index: %d is an offload event ring\n",
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 58 i);
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 59 continue;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 60 }
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 61
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 62 seq_printf(m, "Index: %d intmod count: %lu time: %lu",
cd182486e4578f Paul Davey 2021-06-23 63 i, (le32_to_cpu(er_ctxt->intmod) & EV_CTX_INTMODC_MASK) >>
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 64 EV_CTX_INTMODC_SHIFT,
cd182486e4578f Paul Davey 2021-06-23 65 (le32_to_cpu(er_ctxt->intmod) & EV_CTX_INTMODT_MASK) >>
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 66 EV_CTX_INTMODT_SHIFT);
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 67
cd182486e4578f Paul Davey 2021-06-23 68 seq_printf(m, " base: 0x%0llx len: 0x%llx", le64_to_cpu(er_ctxt->rbase),
cd182486e4578f Paul Davey 2021-06-23 69 le64_to_cpu(er_ctxt->rlen));
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 70
cd182486e4578f Paul Davey 2021-06-23 71 seq_printf(m, " rp: 0x%llx wp: 0x%llx", le64_to_cpu(er_ctxt->rp),
cd182486e4578f Paul Davey 2021-06-23 72 le64_to_cpu(er_ctxt->wp));
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 73
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 @74 seq_printf(m, " local rp: 0x%pK db: 0x%pad\n", ring->rp,
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 75 &mhi_event->db_cfg.db_val);
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 76 }
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 77
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 78 return 0;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 79 }
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 80
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 81 static int mhi_debugfs_channels_show(struct seq_file *m, void *d)
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 82 {
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 83 struct mhi_controller *mhi_cntrl = m->private;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 84 struct mhi_chan *mhi_chan;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 85 struct mhi_chan_ctxt *chan_ctxt;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 86 int i;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 87
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 88 if (!mhi_is_active(mhi_cntrl)) {
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 89 seq_puts(m, "Device not ready\n");
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 90 return -ENODEV;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 91 }
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 92
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 93 mhi_chan = mhi_cntrl->mhi_chan;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 94 chan_ctxt = mhi_cntrl->mhi_ctxt->chan_ctxt;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 95 for (i = 0; i < mhi_cntrl->max_chan; i++, chan_ctxt++, mhi_chan++) {
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 96 struct mhi_ring *ring = &mhi_chan->tre_ring;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 97
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 98 if (mhi_chan->offload_ch) {
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 99 seq_printf(m, "%s(%u) is an offload channel\n",
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 100 mhi_chan->name, mhi_chan->chan);
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 101 continue;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 102 }
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 103
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 104 if (!mhi_chan->mhi_dev)
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 105 continue;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 106
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 107 seq_printf(m,
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 108 "%s(%u) state: 0x%lx brstmode: 0x%lx pollcfg: 0x%lx",
cd182486e4578f Paul Davey 2021-06-23 109 mhi_chan->name, mhi_chan->chan, (le32_to_cpu(chan_ctxt->chcfg) &
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 110 CHAN_CTX_CHSTATE_MASK) >> CHAN_CTX_CHSTATE_SHIFT,
cd182486e4578f Paul Davey 2021-06-23 111 (le32_to_cpu(chan_ctxt->chcfg) & CHAN_CTX_BRSTMODE_MASK) >>
cd182486e4578f Paul Davey 2021-06-23 112 CHAN_CTX_BRSTMODE_SHIFT, (le32_to_cpu(chan_ctxt->chcfg) &
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 113 CHAN_CTX_POLLCFG_MASK) >> CHAN_CTX_POLLCFG_SHIFT);
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 114
cd182486e4578f Paul Davey 2021-06-23 115 seq_printf(m, " type: 0x%x event ring: %u", le32_to_cpu(chan_ctxt->chtype),
cd182486e4578f Paul Davey 2021-06-23 116 le32_to_cpu(chan_ctxt->erindex));
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 117
9e8c8cc44f35bb Loic Poulain 2020-09-29 118 seq_printf(m, " base: 0x%llx len: 0x%llx rp: 0x%llx wp: 0x%llx",
cd182486e4578f Paul Davey 2021-06-23 119 le64_to_cpu(chan_ctxt->rbase), le64_to_cpu(chan_ctxt->rlen),
cd182486e4578f Paul Davey 2021-06-23 120 le64_to_cpu(chan_ctxt->rp), le64_to_cpu(chan_ctxt->wp));
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 121
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 @122 seq_printf(m, " local rp: 0x%pK local wp: 0x%pK db: 0x%pad\n",
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 123 ring->rp, ring->wp,
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 124 &mhi_chan->db_cfg.db_val);
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 125 }
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 126
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 127 return 0;
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 128 }
c7bd825e52b3d0 Bhaumik Bhatt 2020-09-29 129
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 25230 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/2] bus: mhi: Fix MHI DMA structure endianness
2021-06-24 2:11 ` Bhaumik Bhatt
@ 2021-06-24 23:12 ` Paul Davey
0 siblings, 0 replies; 4+ messages in thread
From: Paul Davey @ 2021-06-24 23:12 UTC (permalink / raw)
To: bbhatt; +Cc: linux-kernel, mani, linux-arm-msm, hemantk
On Wed, 2021-06-23 at 19:11 -0700, Bhaumik Bhatt wrote:
> On 2021-06-22 07:43 PM, Paul Davey wrote:
> > The MHI driver does not work on big endian architectures. The
> > controller never transitions into mission mode. This appears to be
> > due
> > to the modem device expecting the various contexts and transfer
> > rings
> > to
> > have fields in little endian order in memory, but the driver
> > constructs
> > them in native endianness.
> >
> > Fix MHI event, channel and command contexts and TRE handling macros
> > to
> > use explicit conversion to little endian. Mark fields in relevant
> > structures as little endian to document this requirement.
> >
> > Tested-on: X86_64 desktop running Ubuntu 18.04 distribution with
> > SDX65
> > device
> > Tested-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
> > Signed-off-by: Paul Davey <paul.davey@alliedtelesis.co.nz>
> > ---
> > drivers/bus/mhi/core/debugfs.c | 26 +++----
> > drivers/bus/mhi/core/init.c | 36 ++++-----
> > drivers/bus/mhi/core/internal.h | 129 ++++++++++++++++----------
> > ------
> > drivers/bus/mhi/core/main.c | 36 ++++-----
> > drivers/bus/mhi/core/pm.c | 8 +-
> > 5 files changed, 119 insertions(+), 116 deletions(-)
> >
> > diff --git a/drivers/bus/mhi/core/debugfs.c
> > b/drivers/bus/mhi/core/debugfs.c
> > index 858d7516410b..d818586c229d 100644
> > --- a/drivers/bus/mhi/core/debugfs.c
> > +++ b/drivers/bus/mhi/core/debugfs.c
> > @@ -60,16 +60,16 @@ static int mhi_debugfs_events_show(struct
> > seq_file
> > *m, void *d)
> > }
> >
> > seq_printf(m, "Index: %d intmod count: %lu time: %lu",
> > - i, (er_ctxt->intmod & EV_CTX_INTMODC_MASK)
> > >>
> > + i, (le32_to_cpu(er_ctxt->intmod) &
> > EV_CTX_INTMODC_MASK) >>
> > EV_CTX_INTMODC_SHIFT,
> > - (er_ctxt->intmod & EV_CTX_INTMODT_MASK) >>
> > + (le32_to_cpu(er_ctxt->intmod) &
> > EV_CTX_INTMODT_MASK) >>
> > EV_CTX_INTMODT_SHIFT);
> >
> > - seq_printf(m, " base: 0x%0llx len: 0x%llx", er_ctxt-
> > >rbase,
> > - er_ctxt->rlen);
> > + seq_printf(m, " base: 0x%0llx len: 0x%llx",
> > le64_to_cpu(er_ctxt->rbase),
> > + le64_to_cpu(er_ctxt->rlen));
> >
> > - seq_printf(m, " rp: 0x%llx wp: 0x%llx", er_ctxt->rp,
> > - er_ctxt->wp);
> > + seq_printf(m, " rp: 0x%llx wp: 0x%llx",
> > le64_to_cpu(er_ctxt->rp),
> > + le64_to_cpu(er_ctxt->wp));
> >
> > seq_printf(m, " local rp: 0x%pK db: 0x%pad\n", ring-
> > >rp,
> > &mhi_event->db_cfg.db_val);
> > @@ -106,18 +106,18 @@ static int mhi_debugfs_channels_show(struct
> > seq_file *m, void *d)
> >
> > seq_printf(m,
> > "%s(%u) state: 0x%lx brstmode: 0x%lx
> > pollcfg: 0x%lx",
> > - mhi_chan->name, mhi_chan->chan, (chan_ctxt-
> > >chcfg &
> > + mhi_chan->name, mhi_chan->chan,
> > (le32_to_cpu(chan_ctxt->chcfg) &
> > CHAN_CTX_CHSTATE_MASK) >>
> > CHAN_CTX_CHSTATE_SHIFT,
> > - (chan_ctxt->chcfg & CHAN_CTX_BRSTMODE_MASK)
> > >>
> > - CHAN_CTX_BRSTMODE_SHIFT, (chan_ctxt->chcfg &
> > + (le32_to_cpu(chan_ctxt->chcfg) &
> > CHAN_CTX_BRSTMODE_MASK) >>
> > + CHAN_CTX_BRSTMODE_SHIFT,
> > (le32_to_cpu(chan_ctxt->chcfg) &
> > CHAN_CTX_POLLCFG_MASK) >>
> > CHAN_CTX_POLLCFG_SHIFT);
> >
> > - seq_printf(m, " type: 0x%x event ring: %u", chan_ctxt-
> > >chtype,
> > - chan_ctxt->erindex);
> > + seq_printf(m, " type: 0x%x event ring: %u",
> > le32_to_cpu(chan_ctxt->chtype),
> > + le32_to_cpu(chan_ctxt->erindex));
> >
> > seq_printf(m, " base: 0x%llx len: 0x%llx rp: 0x%llx wp:
> > 0x%llx",
> > - chan_ctxt->rbase, chan_ctxt->rlen,
> > chan_ctxt->rp,
> > - chan_ctxt->wp);
> > + le64_to_cpu(chan_ctxt->rbase),
> > le64_to_cpu(chan_ctxt->rlen),
> > + le64_to_cpu(chan_ctxt->rp),
> > le64_to_cpu(chan_ctxt->wp));
> >
> > seq_printf(m, " local rp: 0x%pK local wp: 0x%pK db:
> > 0x%pad\n",
> > ring->rp, ring->wp,
> > diff --git a/drivers/bus/mhi/core/init.c
> > b/drivers/bus/mhi/core/init.c
> > index 0706eb046f2a..77962829941a 100644
> > --- a/drivers/bus/mhi/core/init.c
> > +++ b/drivers/bus/mhi/core/init.c
> > @@ -293,17 +293,17 @@ int mhi_init_dev_ctxt(struct mhi_controller
> > *mhi_cntrl)
> > if (mhi_chan->offload_ch)
> > continue;
> >
> > - tmp = chan_ctxt->chcfg;
> > + tmp = le32_to_cpu(chan_ctxt->chcfg);
> > tmp &= ~CHAN_CTX_CHSTATE_MASK;
> > tmp |= (MHI_CH_STATE_DISABLED <<
> > CHAN_CTX_CHSTATE_SHIFT);
> > tmp &= ~CHAN_CTX_BRSTMODE_MASK;
> > tmp |= (mhi_chan->db_cfg.brstmode <<
> > CHAN_CTX_BRSTMODE_SHIFT);
> > tmp &= ~CHAN_CTX_POLLCFG_MASK;
> > tmp |= (mhi_chan->db_cfg.pollcfg <<
> > CHAN_CTX_POLLCFG_SHIFT);
> > - chan_ctxt->chcfg = tmp;
> > + chan_ctxt->chcfg = cpu_to_le32(tmp);
> >
> > - chan_ctxt->chtype = mhi_chan->type;
> > - chan_ctxt->erindex = mhi_chan->er_index;
> > + chan_ctxt->chtype = cpu_to_le32(mhi_chan->type);
> > + chan_ctxt->erindex = cpu_to_le32(mhi_chan->er_index);
> >
> > mhi_chan->ch_state = MHI_CH_STATE_DISABLED;
> > mhi_chan->tre_ring.db_addr = (void __iomem
> > *)&chan_ctxt->wp;
> > @@ -328,14 +328,14 @@ int mhi_init_dev_ctxt(struct mhi_controller
> > *mhi_cntrl)
> > if (mhi_event->offload_ev)
> > continue;
> >
> > - tmp = er_ctxt->intmod;
> > + tmp = le32_to_cpu(er_ctxt->intmod);
> > tmp &= ~EV_CTX_INTMODC_MASK;
> > tmp &= ~EV_CTX_INTMODT_MASK;
> > tmp |= (mhi_event->intmod << EV_CTX_INTMODT_SHIFT);
> > - er_ctxt->intmod = tmp;
> > + er_ctxt->intmod = cpu_to_le32(tmp);
> >
> > - er_ctxt->ertype = MHI_ER_TYPE_VALID;
> > - er_ctxt->msivec = mhi_event->irq;
> > + er_ctxt->ertype = cpu_to_le32(MHI_ER_TYPE_VALID);
> > + er_ctxt->msivec = cpu_to_le32(mhi_event->irq);
> > mhi_event->db_cfg.db_mode = true;
> >
> > ring->el_size = sizeof(struct mhi_tre);
> > @@ -349,9 +349,9 @@ int mhi_init_dev_ctxt(struct mhi_controller
> > *mhi_cntrl)
> > * ring is empty
> > */
> > ring->rp = ring->wp = ring->base;
> > - er_ctxt->rbase = ring->iommu_base;
> > + er_ctxt->rbase = cpu_to_le64(ring->iommu_base);
> > er_ctxt->rp = er_ctxt->wp = er_ctxt->rbase;
> > - er_ctxt->rlen = ring->len;
> > + er_ctxt->rlen = cpu_to_le64(ring->len);
> > ring->ctxt_wp = &er_ctxt->wp;
> > }
> >
> > @@ -378,9 +378,9 @@ int mhi_init_dev_ctxt(struct mhi_controller
> > *mhi_cntrl)
> > goto error_alloc_cmd;
> >
> > ring->rp = ring->wp = ring->base;
> > - cmd_ctxt->rbase = ring->iommu_base;
> > + cmd_ctxt->rbase = cpu_to_le64(ring->iommu_base);
> > cmd_ctxt->rp = cmd_ctxt->wp = cmd_ctxt->rbase;
> > - cmd_ctxt->rlen = ring->len;
> > + cmd_ctxt->rlen = cpu_to_le64(ring->len);
> > ring->ctxt_wp = &cmd_ctxt->wp;
> > }
> >
> > @@ -581,10 +581,10 @@ void mhi_deinit_chan_ctxt(struct
> > mhi_controller
> > *mhi_cntrl,
> > chan_ctxt->rp = 0;
> > chan_ctxt->wp = 0;
> >
> > - tmp = chan_ctxt->chcfg;
> > + tmp = le32_to_cpu(chan_ctxt->chcfg);
> > tmp &= ~CHAN_CTX_CHSTATE_MASK;
> > tmp |= (MHI_CH_STATE_DISABLED << CHAN_CTX_CHSTATE_SHIFT);
> > - chan_ctxt->chcfg = tmp;
> > + chan_ctxt->chcfg = cpu_to_le32(tmp);
> >
> > /* Update to all cores */
> > smp_wmb();
> > @@ -618,14 +618,14 @@ int mhi_init_chan_ctxt(struct mhi_controller
> > *mhi_cntrl,
> > return -ENOMEM;
> > }
> >
> > - tmp = chan_ctxt->chcfg;
> > + tmp = le32_to_cpu(chan_ctxt->chcfg);
> > tmp &= ~CHAN_CTX_CHSTATE_MASK;
> > tmp |= (MHI_CH_STATE_ENABLED << CHAN_CTX_CHSTATE_SHIFT);
> > - chan_ctxt->chcfg = tmp;
> > + chan_ctxt->chcfg = cpu_to_le32(tmp);
> >
> > - chan_ctxt->rbase = tre_ring->iommu_base;
> > + chan_ctxt->rbase = cpu_to_le64(tre_ring->iommu_base);
> > chan_ctxt->rp = chan_ctxt->wp = chan_ctxt->rbase;
> > - chan_ctxt->rlen = tre_ring->len;
> > + chan_ctxt->rlen = cpu_to_le64(tre_ring->len);
> > tre_ring->ctxt_wp = &chan_ctxt->wp;
> >
> > tre_ring->rp = tre_ring->wp = tre_ring->base;
> > diff --git a/drivers/bus/mhi/core/internal.h
> > b/drivers/bus/mhi/core/internal.h
> > index 672052fe3b44..44634153ed04 100644
> > --- a/drivers/bus/mhi/core/internal.h
> > +++ b/drivers/bus/mhi/core/internal.h
> > @@ -209,14 +209,14 @@ extern struct bus_type mhi_bus_type;
> > #define EV_CTX_INTMODT_MASK GENMASK(31, 16)
> > #define EV_CTX_INTMODT_SHIFT 16
> > struct mhi_event_ctxt {
> > - __u32 intmod;
> > - __u32 ertype;
> > - __u32 msivec;
> > -
> > - __u64 rbase __packed __aligned(4);
> > - __u64 rlen __packed __aligned(4);
> > - __u64 rp __packed __aligned(4);
> > - __u64 wp __packed __aligned(4);
> > + __le32 intmod;
> > + __le32 ertype;
> > + __le32 msivec;
> > +
> > + __le64 rbase __packed __aligned(4);
> > + __le64 rlen __packed __aligned(4);
> > + __le64 rp __packed __aligned(4);
> > + __le64 wp __packed __aligned(4);
> > };
> >
> > #define CHAN_CTX_CHSTATE_MASK GENMASK(7, 0)
> > @@ -227,25 +227,25 @@ struct mhi_event_ctxt {
> > #define CHAN_CTX_POLLCFG_SHIFT 10
> > #define CHAN_CTX_RESERVED_MASK GENMASK(31, 16)
> > struct mhi_chan_ctxt {
> > - __u32 chcfg;
> > - __u32 chtype;
> > - __u32 erindex;
> > -
> > - __u64 rbase __packed __aligned(4);
> > - __u64 rlen __packed __aligned(4);
> > - __u64 rp __packed __aligned(4);
> > - __u64 wp __packed __aligned(4);
> > + __le32 chcfg;
> > + __le32 chtype;
> > + __le32 erindex;
> > +
> > + __le64 rbase __packed __aligned(4);
> > + __le64 rlen __packed __aligned(4);
> > + __le64 rp __packed __aligned(4);
> > + __le64 wp __packed __aligned(4);
> > };
> >
> > struct mhi_cmd_ctxt {
> > - __u32 reserved0;
> > - __u32 reserved1;
> > - __u32 reserved2;
> > -
> > - __u64 rbase __packed __aligned(4);
> > - __u64 rlen __packed __aligned(4);
> > - __u64 rp __packed __aligned(4);
> > - __u64 wp __packed __aligned(4);
> > + __le32 reserved0;
> > + __le32 reserved1;
> > + __le32 reserved2;
> > +
> > + __le64 rbase __packed __aligned(4);
> > + __le64 rlen __packed __aligned(4);
> > + __le64 rp __packed __aligned(4);
> > + __le64 wp __packed __aligned(4);
> > };
> >
> > struct mhi_ctxt {
> > @@ -258,8 +258,8 @@ struct mhi_ctxt {
> > };
> >
> > struct mhi_tre {
> > - u64 ptr;
> > - u32 dword[2];
> > + __le64 ptr;
> > + __le32 dword[2];
> > };
> >
> > struct bhi_vec_entry {
> > @@ -277,57 +277,58 @@ enum mhi_cmd_type {
> > /* No operation command */
> > #define MHI_TRE_CMD_NOOP_PTR (0)
> > #define MHI_TRE_CMD_NOOP_DWORD0 (0)
> > -#define MHI_TRE_CMD_NOOP_DWORD1 (MHI_CMD_NOP << 16)
> > +#define MHI_TRE_CMD_NOOP_DWORD1 (cpu_to_le32(MHI_CMD_NOP << 16))
> >
> > /* Channel reset command */
> > #define MHI_TRE_CMD_RESET_PTR (0)
> > #define MHI_TRE_CMD_RESET_DWORD0 (0)
> > -#define MHI_TRE_CMD_RESET_DWORD1(chid) ((chid << 24) | \
> > - (MHI_CMD_RESET_CHAN << 16))
> > +#define MHI_TRE_CMD_RESET_DWORD1(chid) (cpu_to_le32((chid << 24) |
> > \
> > + (MHI_CMD_RESET_CHAN << 16)))
> >
> > /* Channel stop command */
> > #define MHI_TRE_CMD_STOP_PTR (0)
> > #define MHI_TRE_CMD_STOP_DWORD0 (0)
> > -#define MHI_TRE_CMD_STOP_DWORD1(chid) ((chid << 24) | \
> > - (MHI_CMD_STOP_CHAN << 16))
> > +#define MHI_TRE_CMD_STOP_DWORD1(chid) (cpu_to_le32((chid << 24) |
> > \
> > + (MHI_CMD_STOP_CHAN << 16)))
> >
> > /* Channel start command */
> > #define MHI_TRE_CMD_START_PTR (0)
> > #define MHI_TRE_CMD_START_DWORD0 (0)
> > -#define MHI_TRE_CMD_START_DWORD1(chid) ((chid << 24) | \
> > - (MHI_CMD_START_CHAN << 16))
> > +#define MHI_TRE_CMD_START_DWORD1(chid) (cpu_to_le32((chid << 24) |
> > \
> > + (MHI_CMD_START_CHAN << 16)))
> >
> > -#define MHI_TRE_GET_CMD_CHID(tre) (((tre)->dword[1] >> 24) & 0xFF)
> > -#define MHI_TRE_GET_CMD_TYPE(tre) (((tre)->dword[1] >> 16) & 0xFF)
> > +#define MHI_TRE_GET_DWORD(tre, word)
> > (le32_to_cpu((tre)->dword[(word)]))
> > +#define MHI_TRE_GET_CMD_CHID(tre) ((MHI_TRE_GET_DWORD(tre, 1) >>
> > 24) &
> > 0xFF)
> > +#define MHI_TRE_GET_CMD_TYPE(tre) ((MHI_TRE_GET_DWORD(tre, 1) >>
> > 16) &
> > 0xFF)
> >
> > /* Event descriptor macros */
> > -#define MHI_TRE_EV_PTR(ptr) (ptr)
> > -#define MHI_TRE_EV_DWORD0(code, len) ((code << 24) | len)
> > -#define MHI_TRE_EV_DWORD1(chid, type) ((chid << 24) | (type <<
> > 16))
> > -#define MHI_TRE_GET_EV_PTR(tre) ((tre)->ptr)
> > -#define MHI_TRE_GET_EV_CODE(tre) (((tre)->dword[0] >> 24) & 0xFF)
> > -#define MHI_TRE_GET_EV_LEN(tre) ((tre)->dword[0] & 0xFFFF)
> > -#define MHI_TRE_GET_EV_CHID(tre) (((tre)->dword[1] >> 24) & 0xFF)
> > -#define MHI_TRE_GET_EV_TYPE(tre) (((tre)->dword[1] >> 16) & 0xFF)
> > -#define MHI_TRE_GET_EV_STATE(tre) (((tre)->dword[0] >> 24) & 0xFF)
> > -#define MHI_TRE_GET_EV_EXECENV(tre) (((tre)->dword[0] >> 24) &
> > 0xFF)
> > -#define MHI_TRE_GET_EV_SEQ(tre) ((tre)->dword[0])
> > -#define MHI_TRE_GET_EV_TIME(tre) ((tre)->ptr)
> > -#define MHI_TRE_GET_EV_COOKIE(tre) lower_32_bits((tre)->ptr)
> > -#define MHI_TRE_GET_EV_VEID(tre) (((tre)->dword[0] >> 16) & 0xFF)
> > -#define MHI_TRE_GET_EV_LINKSPEED(tre) (((tre)->dword[1] >> 24) &
> > 0xFF)
> > -#define MHI_TRE_GET_EV_LINKWIDTH(tre) ((tre)->dword[0] & 0xFF)
> > +#define MHI_TRE_EV_PTR(ptr) (cpu_to_le64(ptr))
> > +#define MHI_TRE_EV_DWORD0(code, len) (cpu_to_le32((code << 24) |
> > len))
> > +#define MHI_TRE_EV_DWORD1(chid, type) (cpu_to_le32((chid << 24) |
> > (type << 16)))
> > +#define MHI_TRE_GET_EV_PTR(tre) (le64_to_cpu((tre)->ptr))
> > +#define MHI_TRE_GET_EV_CODE(tre) ((MHI_TRE_GET_DWORD(tre, 0) >>
> > 24) &
> > 0xFF)
> > +#define MHI_TRE_GET_EV_LEN(tre) (MHI_TRE_GET_DWORD(tre, 0) &
> > 0xFFFF)
> > +#define MHI_TRE_GET_EV_CHID(tre) ((MHI_TRE_GET_DWORD(tre, 1) >>
> > 24) &
> > 0xFF)
> > +#define MHI_TRE_GET_EV_TYPE(tre) ((MHI_TRE_GET_DWORD(tre, 1) >>
> > 16) &
> > 0xFF)
> > +#define MHI_TRE_GET_EV_STATE(tre) ((MHI_TRE_GET_DWORD(tre, 0) >>
> > 24) &
> > 0xFF)
> > +#define MHI_TRE_GET_EV_EXECENV(tre) ((MHI_TRE_GET_DWORD(tre, 0) >>
> > 24)
> > & 0xFF)
> > +#define MHI_TRE_GET_EV_SEQ(tre) MHI_TRE_GET_DWORD(tre, 0)
> > +#define MHI_TRE_GET_EV_TIME(tre) (MHI_TRE_GET_EV_PTR(tre))
> > +#define MHI_TRE_GET_EV_COOKIE(tre)
> > lower_32_bits(MHI_TRE_GET_EV_PTR(tre))
> > +#define MHI_TRE_GET_EV_VEID(tre) ((MHI_TRE_GET_DWORD(tre, 0) >>
> > 16) &
> > 0xFF)
> > +#define MHI_TRE_GET_EV_LINKSPEED(tre) ((MHI_TRE_GET_DWORD(tre, 1)
> > >>
> > 24) & 0xFF)
> > +#define MHI_TRE_GET_EV_LINKWIDTH(tre) (MHI_TRE_GET_DWORD(tre, 0)
> > &
> > 0xFF)
> >
> > /* Transfer descriptor macros */
> > -#define MHI_TRE_DATA_PTR(ptr) (ptr)
> > -#define MHI_TRE_DATA_DWORD0(len) (len & MHI_MAX_MTU)
> > -#define MHI_TRE_DATA_DWORD1(bei, ieot, ieob, chain) ((2 << 16) |
> > (bei
> > << 10) \
> > - | (ieot << 9) | (ieob << 8) | chain)
> > +#define MHI_TRE_DATA_PTR(ptr) (cpu_to_le64(ptr))
> > +#define MHI_TRE_DATA_DWORD0(len) (cpu_to_le32(len & MHI_MAX_MTU))
> > +#define MHI_TRE_DATA_DWORD1(bei, ieot, ieob, chain)
> > (cpu_to_le32((2
> > << 16) | (bei << 10) \
> > + | (ieot << 9) | (ieob << 8) | chain))
> >
> > /* RSC transfer descriptor macros */
> > -#define MHI_RSCTRE_DATA_PTR(ptr, len) (((u64)len << 48) | ptr)
> > -#define MHI_RSCTRE_DATA_DWORD0(cookie) (cookie)
> > -#define MHI_RSCTRE_DATA_DWORD1 (MHI_PKT_TYPE_COALESCING << 16)
> > +#define MHI_RSCTRE_DATA_PTR(ptr, len) (cpu_to_le64(((u64)len <<
> > 48) |
> > ptr))
> > +#define MHI_RSCTRE_DATA_DWORD0(cookie) (cpu_to_le32(cookie))
> > +#define MHI_RSCTRE_DATA_DWORD1
> > (cpu_to_le32(MHI_PKT_TYPE_COALESCING <<
> > 16))
> >
> > enum mhi_pkt_type {
> > MHI_PKT_TYPE_INVALID = 0x0,
> > @@ -480,10 +481,10 @@ struct db_cfg {
> > bool db_mode;
> > u32 pollcfg;
> > enum mhi_db_brst_mode brstmode;
> > - dma_addr_t db_val;
> > + __le64 db_val;
>
> Am I correct in assuming that this can break arm/32 bit
> architectures?
> We moved to dma_addr_t to accommodate them as we had seen the issue
> in
> the past.
> Same goes for all instances of dma_addr_t -> __le64
I should be able to put these all back to dma_addr_t and just do the
conversion when writing to ctxt_wp.
> > void (*process_db)(struct mhi_controller *mhi_cntrl,
> > struct db_cfg *db_cfg, void __iomem
> > *io_addr,
> > - dma_addr_t db_val);
> > + __le64 db_val);
> > };
> >
> > struct mhi_pm_transitions {
> > @@ -499,7 +500,7 @@ struct state_transition {
> > struct mhi_ring {
> > dma_addr_t dma_handle;
> > dma_addr_t iommu_base;
> > - u64 *ctxt_wp; /* point to ctxt wp */
> > + __le64 *ctxt_wp; /* point to ctxt wp */
> > void *pre_aligned;
> > void *base;
> > void *rp;
> > @@ -649,10 +650,10 @@ static inline void mhi_trigger_resume(struct
> > mhi_controller *mhi_cntrl)
> >
> > /* Register access methods */
> > void mhi_db_brstmode(struct mhi_controller *mhi_cntrl, struct
> > db_cfg
> > *db_cfg,
> > - void __iomem *db_addr, dma_addr_t db_val);
> > + void __iomem *db_addr, __le64 db_val);
> > void mhi_db_brstmode_disable(struct mhi_controller *mhi_cntrl,
> > struct db_cfg *db_mode, void __iomem
> > *db_addr,
> > - dma_addr_t db_val);
> > + __le64 db_val);
> > int __must_check mhi_read_reg(struct mhi_controller *mhi_cntrl,
> > void __iomem *base, u32 offset, u32
> > *out);
> > int __must_check mhi_read_reg_field(struct mhi_controller
> > *mhi_cntrl,
> > @@ -667,7 +668,7 @@ void mhi_write_reg_field(struct mhi_controller
> > *mhi_cntrl, void __iomem *base,
> > u32 offset, u32 mask, u32 shift, u32 val);
> > void mhi_ring_er_db(struct mhi_event *mhi_event);
> > void mhi_write_db(struct mhi_controller *mhi_cntrl, void __iomem
> > *db_addr,
> > - dma_addr_t db_val);
> > + __le64 db_val);
> > void mhi_ring_cmd_db(struct mhi_controller *mhi_cntrl, struct
> > mhi_cmd
> > *mhi_cmd);
> > void mhi_ring_chan_db(struct mhi_controller *mhi_cntrl,
> > struct mhi_chan *mhi_chan);
> > diff --git a/drivers/bus/mhi/core/main.c
> > b/drivers/bus/mhi/core/main.c
> > index 8ac73f9e92a6..a8c68220d764 100644
> > --- a/drivers/bus/mhi/core/main.c
> > +++ b/drivers/bus/mhi/core/main.c
> > @@ -82,16 +82,18 @@ void mhi_write_reg_field(struct mhi_controller
> > *mhi_cntrl, void __iomem *base,
> > }
> >
> > void mhi_write_db(struct mhi_controller *mhi_cntrl, void __iomem
> > *db_addr,
> > - dma_addr_t db_val)
> > + __le64 db_val)
> > {
> > - mhi_write_reg(mhi_cntrl, db_addr, 4, upper_32_bits(db_val));
> > - mhi_write_reg(mhi_cntrl, db_addr, 0, lower_32_bits(db_val));
> > + dma_addr_t tmp = le64_to_cpu(db_val);
> > +
> > + mhi_write_reg(mhi_cntrl, db_addr, 4, upper_32_bits(tmp));
> > + mhi_write_reg(mhi_cntrl, db_addr, 0, lower_32_bits(tmp));
> > }
> >
> > void mhi_db_brstmode(struct mhi_controller *mhi_cntrl,
> > struct db_cfg *db_cfg,
> > void __iomem *db_addr,
> > - dma_addr_t db_val)
> > + __le64 db_val)
> > {
> > if (db_cfg->db_mode) {
> > db_cfg->db_val = db_val;
> > @@ -103,7 +105,7 @@ void mhi_db_brstmode(struct mhi_controller
> > *mhi_cntrl,
> > void mhi_db_brstmode_disable(struct mhi_controller *mhi_cntrl,
> > struct db_cfg *db_cfg,
> > void __iomem *db_addr,
> > - dma_addr_t db_val)
> > + __le64 db_val)
> > {
> > db_cfg->db_val = db_val;
> > mhi_write_db(mhi_cntrl, db_addr, db_val);
> > @@ -119,10 +121,10 @@ void mhi_ring_er_db(struct mhi_event
> > *mhi_event)
> >
> > void mhi_ring_cmd_db(struct mhi_controller *mhi_cntrl, struct
> > mhi_cmd
> > *mhi_cmd)
> > {
> > - dma_addr_t db;
> > + __le64 db;
> > struct mhi_ring *ring = &mhi_cmd->ring;
> >
> > - db = ring->iommu_base + (ring->wp - ring->base);
> > + db = cpu_to_le64(ring->iommu_base + (ring->wp - ring->base));
> > *ring->ctxt_wp = db;
> > mhi_write_db(mhi_cntrl, ring->db_addr, db);
> > }
> > @@ -131,9 +133,9 @@ void mhi_ring_chan_db(struct mhi_controller
> > *mhi_cntrl,
> > struct mhi_chan *mhi_chan)
> > {
> > struct mhi_ring *ring = &mhi_chan->tre_ring;
> > - dma_addr_t db;
> > + __le64 db;
> >
> > - db = ring->iommu_base + (ring->wp - ring->base);
> > + db = cpu_to_le64(ring->iommu_base + (ring->wp - ring->base));
> >
> > /*
> > * Writes to the new ring element must be visible to the
> > hardware
> > @@ -432,7 +434,7 @@ irqreturn_t mhi_irq_handler(int irq_number,
> > void
> > *dev)
> > struct mhi_event_ctxt *er_ctxt =
> > &mhi_cntrl->mhi_ctxt->er_ctxt[mhi_event->er_index];
> > struct mhi_ring *ev_ring = &mhi_event->ring;
> > - dma_addr_t ptr = er_ctxt->rp;
> > + dma_addr_t ptr = le64_to_cpu(er_ctxt->rp);
> > void *dev_rp;
> >
> > if (!is_valid_ring_ptr(ev_ring, ptr)) {
> > @@ -537,14 +539,14 @@ static void
> > mhi_recycle_ev_ring_element(struct
> > mhi_controller *mhi_cntrl,
> >
> > /* Update the WP */
> > ring->wp += ring->el_size;
> > - ctxt_wp = *ring->ctxt_wp + ring->el_size;
> > + ctxt_wp = le64_to_cpu(*ring->ctxt_wp) + ring->el_size;
> >
> > if (ring->wp >= (ring->base + ring->len)) {
> > ring->wp = ring->base;
> > ctxt_wp = ring->iommu_base;
> > }
> >
> > - *ring->ctxt_wp = ctxt_wp;
> > + *ring->ctxt_wp = cpu_to_le64(ctxt_wp);
> >
> > /* Update the RP */
> > ring->rp += ring->el_size;
> > @@ -799,7 +801,7 @@ int mhi_process_ctrl_ev_ring(struct
> > mhi_controller
> > *mhi_cntrl,
> > struct device *dev = &mhi_cntrl->mhi_dev->dev;
> > u32 chan;
> > int count = 0;
> > - dma_addr_t ptr = er_ctxt->rp;
> > + dma_addr_t ptr = le64_to_cpu(er_ctxt->rp);
> >
> > /*
> > * This is a quick check to avoid unnecessary event processing
> > @@ -938,7 +940,7 @@ int mhi_process_ctrl_ev_ring(struct
> > mhi_controller
> > *mhi_cntrl,
> > mhi_recycle_ev_ring_element(mhi_cntrl, ev_ring);
> > local_rp = ev_ring->rp;
> >
> > - ptr = er_ctxt->rp;
> > + ptr = le64_to_cpu(er_ctxt->rp);
> > if (!is_valid_ring_ptr(ev_ring, ptr)) {
> > dev_err(&mhi_cntrl->mhi_dev->dev,
> > "Event ring rp points outside of the
> > event ring\n");
> > @@ -968,7 +970,7 @@ int mhi_process_data_event_ring(struct
> > mhi_controller *mhi_cntrl,
> > int count = 0;
> > u32 chan;
> > struct mhi_chan *mhi_chan;
> > - dma_addr_t ptr = er_ctxt->rp;
> > + dma_addr_t ptr = le64_to_cpu(er_ctxt->rp);
> >
> > if (unlikely(MHI_EVENT_ACCESS_INVALID(mhi_cntrl->pm_state)))
> > return -EIO;
> > @@ -1009,7 +1011,7 @@ int mhi_process_data_event_ring(struct
> > mhi_controller *mhi_cntrl,
> > mhi_recycle_ev_ring_element(mhi_cntrl, ev_ring);
> > local_rp = ev_ring->rp;
> >
> > - ptr = er_ctxt->rp;
> > + ptr = le64_to_cpu(er_ctxt->rp);
> > if (!is_valid_ring_ptr(ev_ring, ptr)) {
> > dev_err(&mhi_cntrl->mhi_dev->dev,
> > "Event ring rp points outside of the
> > event ring\n");
> > @@ -1531,7 +1533,7 @@ static void mhi_mark_stale_events(struct
> > mhi_controller *mhi_cntrl,
> > /* mark all stale events related to channel as STALE event */
> > spin_lock_irqsave(&mhi_event->lock, flags);
> >
> > - ptr = er_ctxt->rp;
> > + ptr = le64_to_cpu(er_ctxt->rp);
> > if (!is_valid_ring_ptr(ev_ring, ptr)) {
> > dev_err(&mhi_cntrl->mhi_dev->dev,
> > "Event ring rp points outside of the event
> > ring\n");
> > diff --git a/drivers/bus/mhi/core/pm.c b/drivers/bus/mhi/core/pm.c
> > index bbf6cd04861e..0faf173fb963 100644
> > --- a/drivers/bus/mhi/core/pm.c
> > +++ b/drivers/bus/mhi/core/pm.c
> > @@ -218,7 +218,7 @@ int mhi_ready_state_transition(struct
> > mhi_controller *mhi_cntrl)
> > continue;
> >
> > ring->wp = ring->base + ring->len - ring->el_size;
> > - *ring->ctxt_wp = ring->iommu_base + ring->len - ring-
> > >el_size;
> > + *ring->ctxt_wp = cpu_to_le64(ring->iommu_base + ring-
> > >len -
> > ring->el_size);
> > /* Update all cores */
> > smp_wmb();
> >
> > @@ -420,7 +420,7 @@ static int
> > mhi_pm_mission_mode_transition(struct
> > mhi_controller *mhi_cntrl)
> > continue;
> >
> > ring->wp = ring->base + ring->len - ring->el_size;
> > - *ring->ctxt_wp = ring->iommu_base + ring->len - ring-
> > >el_size;
> > + *ring->ctxt_wp = cpu_to_le64(ring->iommu_base + ring-
> > >len -
> > ring->el_size);
> > /* Update to all cores */
> > smp_wmb();
> >
> > @@ -986,7 +986,7 @@ static void mhi_assert_dev_wake(struct
> > mhi_controller *mhi_cntrl, bool force)
> > atomic_inc(&mhi_cntrl->dev_wake);
> > if (MHI_WAKE_DB_FORCE_SET_VALID(mhi_cntrl->pm_state) &&
> > !mhi_cntrl->wake_set) {
> > - mhi_write_db(mhi_cntrl, mhi_cntrl->wake_db, 1);
> > + mhi_write_db(mhi_cntrl, mhi_cntrl->wake_db,
> > cpu_to_le64(1));
> > mhi_cntrl->wake_set = true;
> > }
> > spin_unlock_irqrestore(&mhi_cntrl->wlock, flags);
> > @@ -1002,7 +1002,7 @@ static void mhi_assert_dev_wake(struct
> > mhi_controller *mhi_cntrl, bool force)
> > if ((atomic_inc_return(&mhi_cntrl->dev_wake) == 1) &&
> > MHI_WAKE_DB_SET_VALID(mhi_cntrl->pm_state) &&
> > !mhi_cntrl->wake_set) {
> > - mhi_write_db(mhi_cntrl, mhi_cntrl->wake_db, 1);
> > + mhi_write_db(mhi_cntrl, mhi_cntrl->wake_db,
> > cpu_to_le64(1));
>
> This cpu_to_le64() call should be taken care of inside the write_db
> function instead,
> right?
This is actually to deal with changing the db_val to an __le64.
As far as I can tell the MMIO registers are dealt with such that they
appear in host byte order.
Only the contexts and structures accessed via DMA appear to require
explicit conversion to little endian. I can rework this patch to avoid
having to do this I believe.
> > mhi_cntrl->wake_set = true;
> > }
> > spin_unlock_irqrestore(&mhi_cntrl->wlock, flags);
>
> Thanks,
> Bhaumik
> ---
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora
> Forum,
> a Linux Foundation Collaborative Project
Thanks,
Paul
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/2] bus: mhi: Fix MHI DMA structure endianness
2021-06-23 2:43 ` [PATCH v2 2/2] bus: mhi: Fix MHI DMA structure endianness Paul Davey
@ 2021-06-24 2:11 ` Bhaumik Bhatt
2021-06-24 23:12 ` Paul Davey
0 siblings, 1 reply; 4+ messages in thread
From: Bhaumik Bhatt @ 2021-06-24 2:11 UTC (permalink / raw)
To: Paul Davey
Cc: Manivannan Sadhasivam, linux-arm-msm, linux-kernel, Hemant Kumar
On 2021-06-22 07:43 PM, Paul Davey wrote:
> The MHI driver does not work on big endian architectures. The
> controller never transitions into mission mode. This appears to be due
> to the modem device expecting the various contexts and transfer rings
> to
> have fields in little endian order in memory, but the driver constructs
> them in native endianness.
>
> Fix MHI event, channel and command contexts and TRE handling macros to
> use explicit conversion to little endian. Mark fields in relevant
> structures as little endian to document this requirement.
>
> Tested-on: X86_64 desktop running Ubuntu 18.04 distribution with SDX65
> device
> Tested-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
> Signed-off-by: Paul Davey <paul.davey@alliedtelesis.co.nz>
> ---
> drivers/bus/mhi/core/debugfs.c | 26 +++----
> drivers/bus/mhi/core/init.c | 36 ++++-----
> drivers/bus/mhi/core/internal.h | 129 ++++++++++++++++----------------
> drivers/bus/mhi/core/main.c | 36 ++++-----
> drivers/bus/mhi/core/pm.c | 8 +-
> 5 files changed, 119 insertions(+), 116 deletions(-)
>
> diff --git a/drivers/bus/mhi/core/debugfs.c
> b/drivers/bus/mhi/core/debugfs.c
> index 858d7516410b..d818586c229d 100644
> --- a/drivers/bus/mhi/core/debugfs.c
> +++ b/drivers/bus/mhi/core/debugfs.c
> @@ -60,16 +60,16 @@ static int mhi_debugfs_events_show(struct seq_file
> *m, void *d)
> }
>
> seq_printf(m, "Index: %d intmod count: %lu time: %lu",
> - i, (er_ctxt->intmod & EV_CTX_INTMODC_MASK) >>
> + i, (le32_to_cpu(er_ctxt->intmod) & EV_CTX_INTMODC_MASK) >>
> EV_CTX_INTMODC_SHIFT,
> - (er_ctxt->intmod & EV_CTX_INTMODT_MASK) >>
> + (le32_to_cpu(er_ctxt->intmod) & EV_CTX_INTMODT_MASK) >>
> EV_CTX_INTMODT_SHIFT);
>
> - seq_printf(m, " base: 0x%0llx len: 0x%llx", er_ctxt->rbase,
> - er_ctxt->rlen);
> + seq_printf(m, " base: 0x%0llx len: 0x%llx",
> le64_to_cpu(er_ctxt->rbase),
> + le64_to_cpu(er_ctxt->rlen));
>
> - seq_printf(m, " rp: 0x%llx wp: 0x%llx", er_ctxt->rp,
> - er_ctxt->wp);
> + seq_printf(m, " rp: 0x%llx wp: 0x%llx", le64_to_cpu(er_ctxt->rp),
> + le64_to_cpu(er_ctxt->wp));
>
> seq_printf(m, " local rp: 0x%pK db: 0x%pad\n", ring->rp,
> &mhi_event->db_cfg.db_val);
> @@ -106,18 +106,18 @@ static int mhi_debugfs_channels_show(struct
> seq_file *m, void *d)
>
> seq_printf(m,
> "%s(%u) state: 0x%lx brstmode: 0x%lx pollcfg: 0x%lx",
> - mhi_chan->name, mhi_chan->chan, (chan_ctxt->chcfg &
> + mhi_chan->name, mhi_chan->chan, (le32_to_cpu(chan_ctxt->chcfg) &
> CHAN_CTX_CHSTATE_MASK) >> CHAN_CTX_CHSTATE_SHIFT,
> - (chan_ctxt->chcfg & CHAN_CTX_BRSTMODE_MASK) >>
> - CHAN_CTX_BRSTMODE_SHIFT, (chan_ctxt->chcfg &
> + (le32_to_cpu(chan_ctxt->chcfg) & CHAN_CTX_BRSTMODE_MASK) >>
> + CHAN_CTX_BRSTMODE_SHIFT, (le32_to_cpu(chan_ctxt->chcfg) &
> CHAN_CTX_POLLCFG_MASK) >> CHAN_CTX_POLLCFG_SHIFT);
>
> - seq_printf(m, " type: 0x%x event ring: %u", chan_ctxt->chtype,
> - chan_ctxt->erindex);
> + seq_printf(m, " type: 0x%x event ring: %u",
> le32_to_cpu(chan_ctxt->chtype),
> + le32_to_cpu(chan_ctxt->erindex));
>
> seq_printf(m, " base: 0x%llx len: 0x%llx rp: 0x%llx wp: 0x%llx",
> - chan_ctxt->rbase, chan_ctxt->rlen, chan_ctxt->rp,
> - chan_ctxt->wp);
> + le64_to_cpu(chan_ctxt->rbase), le64_to_cpu(chan_ctxt->rlen),
> + le64_to_cpu(chan_ctxt->rp), le64_to_cpu(chan_ctxt->wp));
>
> seq_printf(m, " local rp: 0x%pK local wp: 0x%pK db: 0x%pad\n",
> ring->rp, ring->wp,
> diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c
> index 0706eb046f2a..77962829941a 100644
> --- a/drivers/bus/mhi/core/init.c
> +++ b/drivers/bus/mhi/core/init.c
> @@ -293,17 +293,17 @@ int mhi_init_dev_ctxt(struct mhi_controller
> *mhi_cntrl)
> if (mhi_chan->offload_ch)
> continue;
>
> - tmp = chan_ctxt->chcfg;
> + tmp = le32_to_cpu(chan_ctxt->chcfg);
> tmp &= ~CHAN_CTX_CHSTATE_MASK;
> tmp |= (MHI_CH_STATE_DISABLED << CHAN_CTX_CHSTATE_SHIFT);
> tmp &= ~CHAN_CTX_BRSTMODE_MASK;
> tmp |= (mhi_chan->db_cfg.brstmode << CHAN_CTX_BRSTMODE_SHIFT);
> tmp &= ~CHAN_CTX_POLLCFG_MASK;
> tmp |= (mhi_chan->db_cfg.pollcfg << CHAN_CTX_POLLCFG_SHIFT);
> - chan_ctxt->chcfg = tmp;
> + chan_ctxt->chcfg = cpu_to_le32(tmp);
>
> - chan_ctxt->chtype = mhi_chan->type;
> - chan_ctxt->erindex = mhi_chan->er_index;
> + chan_ctxt->chtype = cpu_to_le32(mhi_chan->type);
> + chan_ctxt->erindex = cpu_to_le32(mhi_chan->er_index);
>
> mhi_chan->ch_state = MHI_CH_STATE_DISABLED;
> mhi_chan->tre_ring.db_addr = (void __iomem *)&chan_ctxt->wp;
> @@ -328,14 +328,14 @@ int mhi_init_dev_ctxt(struct mhi_controller
> *mhi_cntrl)
> if (mhi_event->offload_ev)
> continue;
>
> - tmp = er_ctxt->intmod;
> + tmp = le32_to_cpu(er_ctxt->intmod);
> tmp &= ~EV_CTX_INTMODC_MASK;
> tmp &= ~EV_CTX_INTMODT_MASK;
> tmp |= (mhi_event->intmod << EV_CTX_INTMODT_SHIFT);
> - er_ctxt->intmod = tmp;
> + er_ctxt->intmod = cpu_to_le32(tmp);
>
> - er_ctxt->ertype = MHI_ER_TYPE_VALID;
> - er_ctxt->msivec = mhi_event->irq;
> + er_ctxt->ertype = cpu_to_le32(MHI_ER_TYPE_VALID);
> + er_ctxt->msivec = cpu_to_le32(mhi_event->irq);
> mhi_event->db_cfg.db_mode = true;
>
> ring->el_size = sizeof(struct mhi_tre);
> @@ -349,9 +349,9 @@ int mhi_init_dev_ctxt(struct mhi_controller
> *mhi_cntrl)
> * ring is empty
> */
> ring->rp = ring->wp = ring->base;
> - er_ctxt->rbase = ring->iommu_base;
> + er_ctxt->rbase = cpu_to_le64(ring->iommu_base);
> er_ctxt->rp = er_ctxt->wp = er_ctxt->rbase;
> - er_ctxt->rlen = ring->len;
> + er_ctxt->rlen = cpu_to_le64(ring->len);
> ring->ctxt_wp = &er_ctxt->wp;
> }
>
> @@ -378,9 +378,9 @@ int mhi_init_dev_ctxt(struct mhi_controller
> *mhi_cntrl)
> goto error_alloc_cmd;
>
> ring->rp = ring->wp = ring->base;
> - cmd_ctxt->rbase = ring->iommu_base;
> + cmd_ctxt->rbase = cpu_to_le64(ring->iommu_base);
> cmd_ctxt->rp = cmd_ctxt->wp = cmd_ctxt->rbase;
> - cmd_ctxt->rlen = ring->len;
> + cmd_ctxt->rlen = cpu_to_le64(ring->len);
> ring->ctxt_wp = &cmd_ctxt->wp;
> }
>
> @@ -581,10 +581,10 @@ void mhi_deinit_chan_ctxt(struct mhi_controller
> *mhi_cntrl,
> chan_ctxt->rp = 0;
> chan_ctxt->wp = 0;
>
> - tmp = chan_ctxt->chcfg;
> + tmp = le32_to_cpu(chan_ctxt->chcfg);
> tmp &= ~CHAN_CTX_CHSTATE_MASK;
> tmp |= (MHI_CH_STATE_DISABLED << CHAN_CTX_CHSTATE_SHIFT);
> - chan_ctxt->chcfg = tmp;
> + chan_ctxt->chcfg = cpu_to_le32(tmp);
>
> /* Update to all cores */
> smp_wmb();
> @@ -618,14 +618,14 @@ int mhi_init_chan_ctxt(struct mhi_controller
> *mhi_cntrl,
> return -ENOMEM;
> }
>
> - tmp = chan_ctxt->chcfg;
> + tmp = le32_to_cpu(chan_ctxt->chcfg);
> tmp &= ~CHAN_CTX_CHSTATE_MASK;
> tmp |= (MHI_CH_STATE_ENABLED << CHAN_CTX_CHSTATE_SHIFT);
> - chan_ctxt->chcfg = tmp;
> + chan_ctxt->chcfg = cpu_to_le32(tmp);
>
> - chan_ctxt->rbase = tre_ring->iommu_base;
> + chan_ctxt->rbase = cpu_to_le64(tre_ring->iommu_base);
> chan_ctxt->rp = chan_ctxt->wp = chan_ctxt->rbase;
> - chan_ctxt->rlen = tre_ring->len;
> + chan_ctxt->rlen = cpu_to_le64(tre_ring->len);
> tre_ring->ctxt_wp = &chan_ctxt->wp;
>
> tre_ring->rp = tre_ring->wp = tre_ring->base;
> diff --git a/drivers/bus/mhi/core/internal.h
> b/drivers/bus/mhi/core/internal.h
> index 672052fe3b44..44634153ed04 100644
> --- a/drivers/bus/mhi/core/internal.h
> +++ b/drivers/bus/mhi/core/internal.h
> @@ -209,14 +209,14 @@ extern struct bus_type mhi_bus_type;
> #define EV_CTX_INTMODT_MASK GENMASK(31, 16)
> #define EV_CTX_INTMODT_SHIFT 16
> struct mhi_event_ctxt {
> - __u32 intmod;
> - __u32 ertype;
> - __u32 msivec;
> -
> - __u64 rbase __packed __aligned(4);
> - __u64 rlen __packed __aligned(4);
> - __u64 rp __packed __aligned(4);
> - __u64 wp __packed __aligned(4);
> + __le32 intmod;
> + __le32 ertype;
> + __le32 msivec;
> +
> + __le64 rbase __packed __aligned(4);
> + __le64 rlen __packed __aligned(4);
> + __le64 rp __packed __aligned(4);
> + __le64 wp __packed __aligned(4);
> };
>
> #define CHAN_CTX_CHSTATE_MASK GENMASK(7, 0)
> @@ -227,25 +227,25 @@ struct mhi_event_ctxt {
> #define CHAN_CTX_POLLCFG_SHIFT 10
> #define CHAN_CTX_RESERVED_MASK GENMASK(31, 16)
> struct mhi_chan_ctxt {
> - __u32 chcfg;
> - __u32 chtype;
> - __u32 erindex;
> -
> - __u64 rbase __packed __aligned(4);
> - __u64 rlen __packed __aligned(4);
> - __u64 rp __packed __aligned(4);
> - __u64 wp __packed __aligned(4);
> + __le32 chcfg;
> + __le32 chtype;
> + __le32 erindex;
> +
> + __le64 rbase __packed __aligned(4);
> + __le64 rlen __packed __aligned(4);
> + __le64 rp __packed __aligned(4);
> + __le64 wp __packed __aligned(4);
> };
>
> struct mhi_cmd_ctxt {
> - __u32 reserved0;
> - __u32 reserved1;
> - __u32 reserved2;
> -
> - __u64 rbase __packed __aligned(4);
> - __u64 rlen __packed __aligned(4);
> - __u64 rp __packed __aligned(4);
> - __u64 wp __packed __aligned(4);
> + __le32 reserved0;
> + __le32 reserved1;
> + __le32 reserved2;
> +
> + __le64 rbase __packed __aligned(4);
> + __le64 rlen __packed __aligned(4);
> + __le64 rp __packed __aligned(4);
> + __le64 wp __packed __aligned(4);
> };
>
> struct mhi_ctxt {
> @@ -258,8 +258,8 @@ struct mhi_ctxt {
> };
>
> struct mhi_tre {
> - u64 ptr;
> - u32 dword[2];
> + __le64 ptr;
> + __le32 dword[2];
> };
>
> struct bhi_vec_entry {
> @@ -277,57 +277,58 @@ enum mhi_cmd_type {
> /* No operation command */
> #define MHI_TRE_CMD_NOOP_PTR (0)
> #define MHI_TRE_CMD_NOOP_DWORD0 (0)
> -#define MHI_TRE_CMD_NOOP_DWORD1 (MHI_CMD_NOP << 16)
> +#define MHI_TRE_CMD_NOOP_DWORD1 (cpu_to_le32(MHI_CMD_NOP << 16))
>
> /* Channel reset command */
> #define MHI_TRE_CMD_RESET_PTR (0)
> #define MHI_TRE_CMD_RESET_DWORD0 (0)
> -#define MHI_TRE_CMD_RESET_DWORD1(chid) ((chid << 24) | \
> - (MHI_CMD_RESET_CHAN << 16))
> +#define MHI_TRE_CMD_RESET_DWORD1(chid) (cpu_to_le32((chid << 24) | \
> + (MHI_CMD_RESET_CHAN << 16)))
>
> /* Channel stop command */
> #define MHI_TRE_CMD_STOP_PTR (0)
> #define MHI_TRE_CMD_STOP_DWORD0 (0)
> -#define MHI_TRE_CMD_STOP_DWORD1(chid) ((chid << 24) | \
> - (MHI_CMD_STOP_CHAN << 16))
> +#define MHI_TRE_CMD_STOP_DWORD1(chid) (cpu_to_le32((chid << 24) | \
> + (MHI_CMD_STOP_CHAN << 16)))
>
> /* Channel start command */
> #define MHI_TRE_CMD_START_PTR (0)
> #define MHI_TRE_CMD_START_DWORD0 (0)
> -#define MHI_TRE_CMD_START_DWORD1(chid) ((chid << 24) | \
> - (MHI_CMD_START_CHAN << 16))
> +#define MHI_TRE_CMD_START_DWORD1(chid) (cpu_to_le32((chid << 24) | \
> + (MHI_CMD_START_CHAN << 16)))
>
> -#define MHI_TRE_GET_CMD_CHID(tre) (((tre)->dword[1] >> 24) & 0xFF)
> -#define MHI_TRE_GET_CMD_TYPE(tre) (((tre)->dword[1] >> 16) & 0xFF)
> +#define MHI_TRE_GET_DWORD(tre, word)
> (le32_to_cpu((tre)->dword[(word)]))
> +#define MHI_TRE_GET_CMD_CHID(tre) ((MHI_TRE_GET_DWORD(tre, 1) >> 24) &
> 0xFF)
> +#define MHI_TRE_GET_CMD_TYPE(tre) ((MHI_TRE_GET_DWORD(tre, 1) >> 16) &
> 0xFF)
>
> /* Event descriptor macros */
> -#define MHI_TRE_EV_PTR(ptr) (ptr)
> -#define MHI_TRE_EV_DWORD0(code, len) ((code << 24) | len)
> -#define MHI_TRE_EV_DWORD1(chid, type) ((chid << 24) | (type << 16))
> -#define MHI_TRE_GET_EV_PTR(tre) ((tre)->ptr)
> -#define MHI_TRE_GET_EV_CODE(tre) (((tre)->dword[0] >> 24) & 0xFF)
> -#define MHI_TRE_GET_EV_LEN(tre) ((tre)->dword[0] & 0xFFFF)
> -#define MHI_TRE_GET_EV_CHID(tre) (((tre)->dword[1] >> 24) & 0xFF)
> -#define MHI_TRE_GET_EV_TYPE(tre) (((tre)->dword[1] >> 16) & 0xFF)
> -#define MHI_TRE_GET_EV_STATE(tre) (((tre)->dword[0] >> 24) & 0xFF)
> -#define MHI_TRE_GET_EV_EXECENV(tre) (((tre)->dword[0] >> 24) & 0xFF)
> -#define MHI_TRE_GET_EV_SEQ(tre) ((tre)->dword[0])
> -#define MHI_TRE_GET_EV_TIME(tre) ((tre)->ptr)
> -#define MHI_TRE_GET_EV_COOKIE(tre) lower_32_bits((tre)->ptr)
> -#define MHI_TRE_GET_EV_VEID(tre) (((tre)->dword[0] >> 16) & 0xFF)
> -#define MHI_TRE_GET_EV_LINKSPEED(tre) (((tre)->dword[1] >> 24) & 0xFF)
> -#define MHI_TRE_GET_EV_LINKWIDTH(tre) ((tre)->dword[0] & 0xFF)
> +#define MHI_TRE_EV_PTR(ptr) (cpu_to_le64(ptr))
> +#define MHI_TRE_EV_DWORD0(code, len) (cpu_to_le32((code << 24) | len))
> +#define MHI_TRE_EV_DWORD1(chid, type) (cpu_to_le32((chid << 24) |
> (type << 16)))
> +#define MHI_TRE_GET_EV_PTR(tre) (le64_to_cpu((tre)->ptr))
> +#define MHI_TRE_GET_EV_CODE(tre) ((MHI_TRE_GET_DWORD(tre, 0) >> 24) &
> 0xFF)
> +#define MHI_TRE_GET_EV_LEN(tre) (MHI_TRE_GET_DWORD(tre, 0) & 0xFFFF)
> +#define MHI_TRE_GET_EV_CHID(tre) ((MHI_TRE_GET_DWORD(tre, 1) >> 24) &
> 0xFF)
> +#define MHI_TRE_GET_EV_TYPE(tre) ((MHI_TRE_GET_DWORD(tre, 1) >> 16) &
> 0xFF)
> +#define MHI_TRE_GET_EV_STATE(tre) ((MHI_TRE_GET_DWORD(tre, 0) >> 24) &
> 0xFF)
> +#define MHI_TRE_GET_EV_EXECENV(tre) ((MHI_TRE_GET_DWORD(tre, 0) >> 24)
> & 0xFF)
> +#define MHI_TRE_GET_EV_SEQ(tre) MHI_TRE_GET_DWORD(tre, 0)
> +#define MHI_TRE_GET_EV_TIME(tre) (MHI_TRE_GET_EV_PTR(tre))
> +#define MHI_TRE_GET_EV_COOKIE(tre)
> lower_32_bits(MHI_TRE_GET_EV_PTR(tre))
> +#define MHI_TRE_GET_EV_VEID(tre) ((MHI_TRE_GET_DWORD(tre, 0) >> 16) &
> 0xFF)
> +#define MHI_TRE_GET_EV_LINKSPEED(tre) ((MHI_TRE_GET_DWORD(tre, 1) >>
> 24) & 0xFF)
> +#define MHI_TRE_GET_EV_LINKWIDTH(tre) (MHI_TRE_GET_DWORD(tre, 0) &
> 0xFF)
>
> /* Transfer descriptor macros */
> -#define MHI_TRE_DATA_PTR(ptr) (ptr)
> -#define MHI_TRE_DATA_DWORD0(len) (len & MHI_MAX_MTU)
> -#define MHI_TRE_DATA_DWORD1(bei, ieot, ieob, chain) ((2 << 16) | (bei
> << 10) \
> - | (ieot << 9) | (ieob << 8) | chain)
> +#define MHI_TRE_DATA_PTR(ptr) (cpu_to_le64(ptr))
> +#define MHI_TRE_DATA_DWORD0(len) (cpu_to_le32(len & MHI_MAX_MTU))
> +#define MHI_TRE_DATA_DWORD1(bei, ieot, ieob, chain) (cpu_to_le32((2
> << 16) | (bei << 10) \
> + | (ieot << 9) | (ieob << 8) | chain))
>
> /* RSC transfer descriptor macros */
> -#define MHI_RSCTRE_DATA_PTR(ptr, len) (((u64)len << 48) | ptr)
> -#define MHI_RSCTRE_DATA_DWORD0(cookie) (cookie)
> -#define MHI_RSCTRE_DATA_DWORD1 (MHI_PKT_TYPE_COALESCING << 16)
> +#define MHI_RSCTRE_DATA_PTR(ptr, len) (cpu_to_le64(((u64)len << 48) |
> ptr))
> +#define MHI_RSCTRE_DATA_DWORD0(cookie) (cpu_to_le32(cookie))
> +#define MHI_RSCTRE_DATA_DWORD1 (cpu_to_le32(MHI_PKT_TYPE_COALESCING <<
> 16))
>
> enum mhi_pkt_type {
> MHI_PKT_TYPE_INVALID = 0x0,
> @@ -480,10 +481,10 @@ struct db_cfg {
> bool db_mode;
> u32 pollcfg;
> enum mhi_db_brst_mode brstmode;
> - dma_addr_t db_val;
> + __le64 db_val;
Am I correct in assuming that this can break arm/32 bit architectures?
We moved to dma_addr_t to accommodate them as we had seen the issue in
the past.
Same goes for all instances of dma_addr_t -> __le64
> void (*process_db)(struct mhi_controller *mhi_cntrl,
> struct db_cfg *db_cfg, void __iomem *io_addr,
> - dma_addr_t db_val);
> + __le64 db_val);
> };
>
> struct mhi_pm_transitions {
> @@ -499,7 +500,7 @@ struct state_transition {
> struct mhi_ring {
> dma_addr_t dma_handle;
> dma_addr_t iommu_base;
> - u64 *ctxt_wp; /* point to ctxt wp */
> + __le64 *ctxt_wp; /* point to ctxt wp */
> void *pre_aligned;
> void *base;
> void *rp;
> @@ -649,10 +650,10 @@ static inline void mhi_trigger_resume(struct
> mhi_controller *mhi_cntrl)
>
> /* Register access methods */
> void mhi_db_brstmode(struct mhi_controller *mhi_cntrl, struct db_cfg
> *db_cfg,
> - void __iomem *db_addr, dma_addr_t db_val);
> + void __iomem *db_addr, __le64 db_val);
> void mhi_db_brstmode_disable(struct mhi_controller *mhi_cntrl,
> struct db_cfg *db_mode, void __iomem *db_addr,
> - dma_addr_t db_val);
> + __le64 db_val);
> int __must_check mhi_read_reg(struct mhi_controller *mhi_cntrl,
> void __iomem *base, u32 offset, u32 *out);
> int __must_check mhi_read_reg_field(struct mhi_controller *mhi_cntrl,
> @@ -667,7 +668,7 @@ void mhi_write_reg_field(struct mhi_controller
> *mhi_cntrl, void __iomem *base,
> u32 offset, u32 mask, u32 shift, u32 val);
> void mhi_ring_er_db(struct mhi_event *mhi_event);
> void mhi_write_db(struct mhi_controller *mhi_cntrl, void __iomem
> *db_addr,
> - dma_addr_t db_val);
> + __le64 db_val);
> void mhi_ring_cmd_db(struct mhi_controller *mhi_cntrl, struct mhi_cmd
> *mhi_cmd);
> void mhi_ring_chan_db(struct mhi_controller *mhi_cntrl,
> struct mhi_chan *mhi_chan);
> diff --git a/drivers/bus/mhi/core/main.c b/drivers/bus/mhi/core/main.c
> index 8ac73f9e92a6..a8c68220d764 100644
> --- a/drivers/bus/mhi/core/main.c
> +++ b/drivers/bus/mhi/core/main.c
> @@ -82,16 +82,18 @@ void mhi_write_reg_field(struct mhi_controller
> *mhi_cntrl, void __iomem *base,
> }
>
> void mhi_write_db(struct mhi_controller *mhi_cntrl, void __iomem
> *db_addr,
> - dma_addr_t db_val)
> + __le64 db_val)
> {
> - mhi_write_reg(mhi_cntrl, db_addr, 4, upper_32_bits(db_val));
> - mhi_write_reg(mhi_cntrl, db_addr, 0, lower_32_bits(db_val));
> + dma_addr_t tmp = le64_to_cpu(db_val);
> +
> + mhi_write_reg(mhi_cntrl, db_addr, 4, upper_32_bits(tmp));
> + mhi_write_reg(mhi_cntrl, db_addr, 0, lower_32_bits(tmp));
> }
>
> void mhi_db_brstmode(struct mhi_controller *mhi_cntrl,
> struct db_cfg *db_cfg,
> void __iomem *db_addr,
> - dma_addr_t db_val)
> + __le64 db_val)
> {
> if (db_cfg->db_mode) {
> db_cfg->db_val = db_val;
> @@ -103,7 +105,7 @@ void mhi_db_brstmode(struct mhi_controller
> *mhi_cntrl,
> void mhi_db_brstmode_disable(struct mhi_controller *mhi_cntrl,
> struct db_cfg *db_cfg,
> void __iomem *db_addr,
> - dma_addr_t db_val)
> + __le64 db_val)
> {
> db_cfg->db_val = db_val;
> mhi_write_db(mhi_cntrl, db_addr, db_val);
> @@ -119,10 +121,10 @@ void mhi_ring_er_db(struct mhi_event *mhi_event)
>
> void mhi_ring_cmd_db(struct mhi_controller *mhi_cntrl, struct mhi_cmd
> *mhi_cmd)
> {
> - dma_addr_t db;
> + __le64 db;
> struct mhi_ring *ring = &mhi_cmd->ring;
>
> - db = ring->iommu_base + (ring->wp - ring->base);
> + db = cpu_to_le64(ring->iommu_base + (ring->wp - ring->base));
> *ring->ctxt_wp = db;
> mhi_write_db(mhi_cntrl, ring->db_addr, db);
> }
> @@ -131,9 +133,9 @@ void mhi_ring_chan_db(struct mhi_controller
> *mhi_cntrl,
> struct mhi_chan *mhi_chan)
> {
> struct mhi_ring *ring = &mhi_chan->tre_ring;
> - dma_addr_t db;
> + __le64 db;
>
> - db = ring->iommu_base + (ring->wp - ring->base);
> + db = cpu_to_le64(ring->iommu_base + (ring->wp - ring->base));
>
> /*
> * Writes to the new ring element must be visible to the hardware
> @@ -432,7 +434,7 @@ irqreturn_t mhi_irq_handler(int irq_number, void
> *dev)
> struct mhi_event_ctxt *er_ctxt =
> &mhi_cntrl->mhi_ctxt->er_ctxt[mhi_event->er_index];
> struct mhi_ring *ev_ring = &mhi_event->ring;
> - dma_addr_t ptr = er_ctxt->rp;
> + dma_addr_t ptr = le64_to_cpu(er_ctxt->rp);
> void *dev_rp;
>
> if (!is_valid_ring_ptr(ev_ring, ptr)) {
> @@ -537,14 +539,14 @@ static void mhi_recycle_ev_ring_element(struct
> mhi_controller *mhi_cntrl,
>
> /* Update the WP */
> ring->wp += ring->el_size;
> - ctxt_wp = *ring->ctxt_wp + ring->el_size;
> + ctxt_wp = le64_to_cpu(*ring->ctxt_wp) + ring->el_size;
>
> if (ring->wp >= (ring->base + ring->len)) {
> ring->wp = ring->base;
> ctxt_wp = ring->iommu_base;
> }
>
> - *ring->ctxt_wp = ctxt_wp;
> + *ring->ctxt_wp = cpu_to_le64(ctxt_wp);
>
> /* Update the RP */
> ring->rp += ring->el_size;
> @@ -799,7 +801,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller
> *mhi_cntrl,
> struct device *dev = &mhi_cntrl->mhi_dev->dev;
> u32 chan;
> int count = 0;
> - dma_addr_t ptr = er_ctxt->rp;
> + dma_addr_t ptr = le64_to_cpu(er_ctxt->rp);
>
> /*
> * This is a quick check to avoid unnecessary event processing
> @@ -938,7 +940,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller
> *mhi_cntrl,
> mhi_recycle_ev_ring_element(mhi_cntrl, ev_ring);
> local_rp = ev_ring->rp;
>
> - ptr = er_ctxt->rp;
> + ptr = le64_to_cpu(er_ctxt->rp);
> if (!is_valid_ring_ptr(ev_ring, ptr)) {
> dev_err(&mhi_cntrl->mhi_dev->dev,
> "Event ring rp points outside of the event ring\n");
> @@ -968,7 +970,7 @@ int mhi_process_data_event_ring(struct
> mhi_controller *mhi_cntrl,
> int count = 0;
> u32 chan;
> struct mhi_chan *mhi_chan;
> - dma_addr_t ptr = er_ctxt->rp;
> + dma_addr_t ptr = le64_to_cpu(er_ctxt->rp);
>
> if (unlikely(MHI_EVENT_ACCESS_INVALID(mhi_cntrl->pm_state)))
> return -EIO;
> @@ -1009,7 +1011,7 @@ int mhi_process_data_event_ring(struct
> mhi_controller *mhi_cntrl,
> mhi_recycle_ev_ring_element(mhi_cntrl, ev_ring);
> local_rp = ev_ring->rp;
>
> - ptr = er_ctxt->rp;
> + ptr = le64_to_cpu(er_ctxt->rp);
> if (!is_valid_ring_ptr(ev_ring, ptr)) {
> dev_err(&mhi_cntrl->mhi_dev->dev,
> "Event ring rp points outside of the event ring\n");
> @@ -1531,7 +1533,7 @@ static void mhi_mark_stale_events(struct
> mhi_controller *mhi_cntrl,
> /* mark all stale events related to channel as STALE event */
> spin_lock_irqsave(&mhi_event->lock, flags);
>
> - ptr = er_ctxt->rp;
> + ptr = le64_to_cpu(er_ctxt->rp);
> if (!is_valid_ring_ptr(ev_ring, ptr)) {
> dev_err(&mhi_cntrl->mhi_dev->dev,
> "Event ring rp points outside of the event ring\n");
> diff --git a/drivers/bus/mhi/core/pm.c b/drivers/bus/mhi/core/pm.c
> index bbf6cd04861e..0faf173fb963 100644
> --- a/drivers/bus/mhi/core/pm.c
> +++ b/drivers/bus/mhi/core/pm.c
> @@ -218,7 +218,7 @@ int mhi_ready_state_transition(struct
> mhi_controller *mhi_cntrl)
> continue;
>
> ring->wp = ring->base + ring->len - ring->el_size;
> - *ring->ctxt_wp = ring->iommu_base + ring->len - ring->el_size;
> + *ring->ctxt_wp = cpu_to_le64(ring->iommu_base + ring->len -
> ring->el_size);
> /* Update all cores */
> smp_wmb();
>
> @@ -420,7 +420,7 @@ static int mhi_pm_mission_mode_transition(struct
> mhi_controller *mhi_cntrl)
> continue;
>
> ring->wp = ring->base + ring->len - ring->el_size;
> - *ring->ctxt_wp = ring->iommu_base + ring->len - ring->el_size;
> + *ring->ctxt_wp = cpu_to_le64(ring->iommu_base + ring->len -
> ring->el_size);
> /* Update to all cores */
> smp_wmb();
>
> @@ -986,7 +986,7 @@ static void mhi_assert_dev_wake(struct
> mhi_controller *mhi_cntrl, bool force)
> atomic_inc(&mhi_cntrl->dev_wake);
> if (MHI_WAKE_DB_FORCE_SET_VALID(mhi_cntrl->pm_state) &&
> !mhi_cntrl->wake_set) {
> - mhi_write_db(mhi_cntrl, mhi_cntrl->wake_db, 1);
> + mhi_write_db(mhi_cntrl, mhi_cntrl->wake_db, cpu_to_le64(1));
> mhi_cntrl->wake_set = true;
> }
> spin_unlock_irqrestore(&mhi_cntrl->wlock, flags);
> @@ -1002,7 +1002,7 @@ static void mhi_assert_dev_wake(struct
> mhi_controller *mhi_cntrl, bool force)
> if ((atomic_inc_return(&mhi_cntrl->dev_wake) == 1) &&
> MHI_WAKE_DB_SET_VALID(mhi_cntrl->pm_state) &&
> !mhi_cntrl->wake_set) {
> - mhi_write_db(mhi_cntrl, mhi_cntrl->wake_db, 1);
> + mhi_write_db(mhi_cntrl, mhi_cntrl->wake_db, cpu_to_le64(1));
This cpu_to_le64() call should be taken care of inside the write_db
function instead,
right?
> mhi_cntrl->wake_set = true;
> }
> spin_unlock_irqrestore(&mhi_cntrl->wlock, flags);
Thanks,
Bhaumik
---
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora
Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] bus: mhi: Fix MHI DMA structure endianness
2021-06-23 2:43 [PATCH v2 0/2] bus: mhi: Fix MHI on big endian architectures Paul Davey
@ 2021-06-23 2:43 ` Paul Davey
2021-06-24 2:11 ` Bhaumik Bhatt
0 siblings, 1 reply; 4+ messages in thread
From: Paul Davey @ 2021-06-23 2:43 UTC (permalink / raw)
To: Manivannan Sadhasivam
Cc: linux-arm-msm, linux-kernel, Bhaumik Bhatt, Hemant Kumar, Paul Davey
The MHI driver does not work on big endian architectures. The
controller never transitions into mission mode. This appears to be due
to the modem device expecting the various contexts and transfer rings to
have fields in little endian order in memory, but the driver constructs
them in native endianness.
Fix MHI event, channel and command contexts and TRE handling macros to
use explicit conversion to little endian. Mark fields in relevant
structures as little endian to document this requirement.
Tested-on: X86_64 desktop running Ubuntu 18.04 distribution with SDX65
device
Tested-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
Signed-off-by: Paul Davey <paul.davey@alliedtelesis.co.nz>
---
drivers/bus/mhi/core/debugfs.c | 26 +++----
drivers/bus/mhi/core/init.c | 36 ++++-----
drivers/bus/mhi/core/internal.h | 129 ++++++++++++++++----------------
drivers/bus/mhi/core/main.c | 36 ++++-----
drivers/bus/mhi/core/pm.c | 8 +-
5 files changed, 119 insertions(+), 116 deletions(-)
diff --git a/drivers/bus/mhi/core/debugfs.c b/drivers/bus/mhi/core/debugfs.c
index 858d7516410b..d818586c229d 100644
--- a/drivers/bus/mhi/core/debugfs.c
+++ b/drivers/bus/mhi/core/debugfs.c
@@ -60,16 +60,16 @@ static int mhi_debugfs_events_show(struct seq_file *m, void *d)
}
seq_printf(m, "Index: %d intmod count: %lu time: %lu",
- i, (er_ctxt->intmod & EV_CTX_INTMODC_MASK) >>
+ i, (le32_to_cpu(er_ctxt->intmod) & EV_CTX_INTMODC_MASK) >>
EV_CTX_INTMODC_SHIFT,
- (er_ctxt->intmod & EV_CTX_INTMODT_MASK) >>
+ (le32_to_cpu(er_ctxt->intmod) & EV_CTX_INTMODT_MASK) >>
EV_CTX_INTMODT_SHIFT);
- seq_printf(m, " base: 0x%0llx len: 0x%llx", er_ctxt->rbase,
- er_ctxt->rlen);
+ seq_printf(m, " base: 0x%0llx len: 0x%llx", le64_to_cpu(er_ctxt->rbase),
+ le64_to_cpu(er_ctxt->rlen));
- seq_printf(m, " rp: 0x%llx wp: 0x%llx", er_ctxt->rp,
- er_ctxt->wp);
+ seq_printf(m, " rp: 0x%llx wp: 0x%llx", le64_to_cpu(er_ctxt->rp),
+ le64_to_cpu(er_ctxt->wp));
seq_printf(m, " local rp: 0x%pK db: 0x%pad\n", ring->rp,
&mhi_event->db_cfg.db_val);
@@ -106,18 +106,18 @@ static int mhi_debugfs_channels_show(struct seq_file *m, void *d)
seq_printf(m,
"%s(%u) state: 0x%lx brstmode: 0x%lx pollcfg: 0x%lx",
- mhi_chan->name, mhi_chan->chan, (chan_ctxt->chcfg &
+ mhi_chan->name, mhi_chan->chan, (le32_to_cpu(chan_ctxt->chcfg) &
CHAN_CTX_CHSTATE_MASK) >> CHAN_CTX_CHSTATE_SHIFT,
- (chan_ctxt->chcfg & CHAN_CTX_BRSTMODE_MASK) >>
- CHAN_CTX_BRSTMODE_SHIFT, (chan_ctxt->chcfg &
+ (le32_to_cpu(chan_ctxt->chcfg) & CHAN_CTX_BRSTMODE_MASK) >>
+ CHAN_CTX_BRSTMODE_SHIFT, (le32_to_cpu(chan_ctxt->chcfg) &
CHAN_CTX_POLLCFG_MASK) >> CHAN_CTX_POLLCFG_SHIFT);
- seq_printf(m, " type: 0x%x event ring: %u", chan_ctxt->chtype,
- chan_ctxt->erindex);
+ seq_printf(m, " type: 0x%x event ring: %u", le32_to_cpu(chan_ctxt->chtype),
+ le32_to_cpu(chan_ctxt->erindex));
seq_printf(m, " base: 0x%llx len: 0x%llx rp: 0x%llx wp: 0x%llx",
- chan_ctxt->rbase, chan_ctxt->rlen, chan_ctxt->rp,
- chan_ctxt->wp);
+ le64_to_cpu(chan_ctxt->rbase), le64_to_cpu(chan_ctxt->rlen),
+ le64_to_cpu(chan_ctxt->rp), le64_to_cpu(chan_ctxt->wp));
seq_printf(m, " local rp: 0x%pK local wp: 0x%pK db: 0x%pad\n",
ring->rp, ring->wp,
diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c
index 0706eb046f2a..77962829941a 100644
--- a/drivers/bus/mhi/core/init.c
+++ b/drivers/bus/mhi/core/init.c
@@ -293,17 +293,17 @@ int mhi_init_dev_ctxt(struct mhi_controller *mhi_cntrl)
if (mhi_chan->offload_ch)
continue;
- tmp = chan_ctxt->chcfg;
+ tmp = le32_to_cpu(chan_ctxt->chcfg);
tmp &= ~CHAN_CTX_CHSTATE_MASK;
tmp |= (MHI_CH_STATE_DISABLED << CHAN_CTX_CHSTATE_SHIFT);
tmp &= ~CHAN_CTX_BRSTMODE_MASK;
tmp |= (mhi_chan->db_cfg.brstmode << CHAN_CTX_BRSTMODE_SHIFT);
tmp &= ~CHAN_CTX_POLLCFG_MASK;
tmp |= (mhi_chan->db_cfg.pollcfg << CHAN_CTX_POLLCFG_SHIFT);
- chan_ctxt->chcfg = tmp;
+ chan_ctxt->chcfg = cpu_to_le32(tmp);
- chan_ctxt->chtype = mhi_chan->type;
- chan_ctxt->erindex = mhi_chan->er_index;
+ chan_ctxt->chtype = cpu_to_le32(mhi_chan->type);
+ chan_ctxt->erindex = cpu_to_le32(mhi_chan->er_index);
mhi_chan->ch_state = MHI_CH_STATE_DISABLED;
mhi_chan->tre_ring.db_addr = (void __iomem *)&chan_ctxt->wp;
@@ -328,14 +328,14 @@ int mhi_init_dev_ctxt(struct mhi_controller *mhi_cntrl)
if (mhi_event->offload_ev)
continue;
- tmp = er_ctxt->intmod;
+ tmp = le32_to_cpu(er_ctxt->intmod);
tmp &= ~EV_CTX_INTMODC_MASK;
tmp &= ~EV_CTX_INTMODT_MASK;
tmp |= (mhi_event->intmod << EV_CTX_INTMODT_SHIFT);
- er_ctxt->intmod = tmp;
+ er_ctxt->intmod = cpu_to_le32(tmp);
- er_ctxt->ertype = MHI_ER_TYPE_VALID;
- er_ctxt->msivec = mhi_event->irq;
+ er_ctxt->ertype = cpu_to_le32(MHI_ER_TYPE_VALID);
+ er_ctxt->msivec = cpu_to_le32(mhi_event->irq);
mhi_event->db_cfg.db_mode = true;
ring->el_size = sizeof(struct mhi_tre);
@@ -349,9 +349,9 @@ int mhi_init_dev_ctxt(struct mhi_controller *mhi_cntrl)
* ring is empty
*/
ring->rp = ring->wp = ring->base;
- er_ctxt->rbase = ring->iommu_base;
+ er_ctxt->rbase = cpu_to_le64(ring->iommu_base);
er_ctxt->rp = er_ctxt->wp = er_ctxt->rbase;
- er_ctxt->rlen = ring->len;
+ er_ctxt->rlen = cpu_to_le64(ring->len);
ring->ctxt_wp = &er_ctxt->wp;
}
@@ -378,9 +378,9 @@ int mhi_init_dev_ctxt(struct mhi_controller *mhi_cntrl)
goto error_alloc_cmd;
ring->rp = ring->wp = ring->base;
- cmd_ctxt->rbase = ring->iommu_base;
+ cmd_ctxt->rbase = cpu_to_le64(ring->iommu_base);
cmd_ctxt->rp = cmd_ctxt->wp = cmd_ctxt->rbase;
- cmd_ctxt->rlen = ring->len;
+ cmd_ctxt->rlen = cpu_to_le64(ring->len);
ring->ctxt_wp = &cmd_ctxt->wp;
}
@@ -581,10 +581,10 @@ void mhi_deinit_chan_ctxt(struct mhi_controller *mhi_cntrl,
chan_ctxt->rp = 0;
chan_ctxt->wp = 0;
- tmp = chan_ctxt->chcfg;
+ tmp = le32_to_cpu(chan_ctxt->chcfg);
tmp &= ~CHAN_CTX_CHSTATE_MASK;
tmp |= (MHI_CH_STATE_DISABLED << CHAN_CTX_CHSTATE_SHIFT);
- chan_ctxt->chcfg = tmp;
+ chan_ctxt->chcfg = cpu_to_le32(tmp);
/* Update to all cores */
smp_wmb();
@@ -618,14 +618,14 @@ int mhi_init_chan_ctxt(struct mhi_controller *mhi_cntrl,
return -ENOMEM;
}
- tmp = chan_ctxt->chcfg;
+ tmp = le32_to_cpu(chan_ctxt->chcfg);
tmp &= ~CHAN_CTX_CHSTATE_MASK;
tmp |= (MHI_CH_STATE_ENABLED << CHAN_CTX_CHSTATE_SHIFT);
- chan_ctxt->chcfg = tmp;
+ chan_ctxt->chcfg = cpu_to_le32(tmp);
- chan_ctxt->rbase = tre_ring->iommu_base;
+ chan_ctxt->rbase = cpu_to_le64(tre_ring->iommu_base);
chan_ctxt->rp = chan_ctxt->wp = chan_ctxt->rbase;
- chan_ctxt->rlen = tre_ring->len;
+ chan_ctxt->rlen = cpu_to_le64(tre_ring->len);
tre_ring->ctxt_wp = &chan_ctxt->wp;
tre_ring->rp = tre_ring->wp = tre_ring->base;
diff --git a/drivers/bus/mhi/core/internal.h b/drivers/bus/mhi/core/internal.h
index 672052fe3b44..44634153ed04 100644
--- a/drivers/bus/mhi/core/internal.h
+++ b/drivers/bus/mhi/core/internal.h
@@ -209,14 +209,14 @@ extern struct bus_type mhi_bus_type;
#define EV_CTX_INTMODT_MASK GENMASK(31, 16)
#define EV_CTX_INTMODT_SHIFT 16
struct mhi_event_ctxt {
- __u32 intmod;
- __u32 ertype;
- __u32 msivec;
-
- __u64 rbase __packed __aligned(4);
- __u64 rlen __packed __aligned(4);
- __u64 rp __packed __aligned(4);
- __u64 wp __packed __aligned(4);
+ __le32 intmod;
+ __le32 ertype;
+ __le32 msivec;
+
+ __le64 rbase __packed __aligned(4);
+ __le64 rlen __packed __aligned(4);
+ __le64 rp __packed __aligned(4);
+ __le64 wp __packed __aligned(4);
};
#define CHAN_CTX_CHSTATE_MASK GENMASK(7, 0)
@@ -227,25 +227,25 @@ struct mhi_event_ctxt {
#define CHAN_CTX_POLLCFG_SHIFT 10
#define CHAN_CTX_RESERVED_MASK GENMASK(31, 16)
struct mhi_chan_ctxt {
- __u32 chcfg;
- __u32 chtype;
- __u32 erindex;
-
- __u64 rbase __packed __aligned(4);
- __u64 rlen __packed __aligned(4);
- __u64 rp __packed __aligned(4);
- __u64 wp __packed __aligned(4);
+ __le32 chcfg;
+ __le32 chtype;
+ __le32 erindex;
+
+ __le64 rbase __packed __aligned(4);
+ __le64 rlen __packed __aligned(4);
+ __le64 rp __packed __aligned(4);
+ __le64 wp __packed __aligned(4);
};
struct mhi_cmd_ctxt {
- __u32 reserved0;
- __u32 reserved1;
- __u32 reserved2;
-
- __u64 rbase __packed __aligned(4);
- __u64 rlen __packed __aligned(4);
- __u64 rp __packed __aligned(4);
- __u64 wp __packed __aligned(4);
+ __le32 reserved0;
+ __le32 reserved1;
+ __le32 reserved2;
+
+ __le64 rbase __packed __aligned(4);
+ __le64 rlen __packed __aligned(4);
+ __le64 rp __packed __aligned(4);
+ __le64 wp __packed __aligned(4);
};
struct mhi_ctxt {
@@ -258,8 +258,8 @@ struct mhi_ctxt {
};
struct mhi_tre {
- u64 ptr;
- u32 dword[2];
+ __le64 ptr;
+ __le32 dword[2];
};
struct bhi_vec_entry {
@@ -277,57 +277,58 @@ enum mhi_cmd_type {
/* No operation command */
#define MHI_TRE_CMD_NOOP_PTR (0)
#define MHI_TRE_CMD_NOOP_DWORD0 (0)
-#define MHI_TRE_CMD_NOOP_DWORD1 (MHI_CMD_NOP << 16)
+#define MHI_TRE_CMD_NOOP_DWORD1 (cpu_to_le32(MHI_CMD_NOP << 16))
/* Channel reset command */
#define MHI_TRE_CMD_RESET_PTR (0)
#define MHI_TRE_CMD_RESET_DWORD0 (0)
-#define MHI_TRE_CMD_RESET_DWORD1(chid) ((chid << 24) | \
- (MHI_CMD_RESET_CHAN << 16))
+#define MHI_TRE_CMD_RESET_DWORD1(chid) (cpu_to_le32((chid << 24) | \
+ (MHI_CMD_RESET_CHAN << 16)))
/* Channel stop command */
#define MHI_TRE_CMD_STOP_PTR (0)
#define MHI_TRE_CMD_STOP_DWORD0 (0)
-#define MHI_TRE_CMD_STOP_DWORD1(chid) ((chid << 24) | \
- (MHI_CMD_STOP_CHAN << 16))
+#define MHI_TRE_CMD_STOP_DWORD1(chid) (cpu_to_le32((chid << 24) | \
+ (MHI_CMD_STOP_CHAN << 16)))
/* Channel start command */
#define MHI_TRE_CMD_START_PTR (0)
#define MHI_TRE_CMD_START_DWORD0 (0)
-#define MHI_TRE_CMD_START_DWORD1(chid) ((chid << 24) | \
- (MHI_CMD_START_CHAN << 16))
+#define MHI_TRE_CMD_START_DWORD1(chid) (cpu_to_le32((chid << 24) | \
+ (MHI_CMD_START_CHAN << 16)))
-#define MHI_TRE_GET_CMD_CHID(tre) (((tre)->dword[1] >> 24) & 0xFF)
-#define MHI_TRE_GET_CMD_TYPE(tre) (((tre)->dword[1] >> 16) & 0xFF)
+#define MHI_TRE_GET_DWORD(tre, word) (le32_to_cpu((tre)->dword[(word)]))
+#define MHI_TRE_GET_CMD_CHID(tre) ((MHI_TRE_GET_DWORD(tre, 1) >> 24) & 0xFF)
+#define MHI_TRE_GET_CMD_TYPE(tre) ((MHI_TRE_GET_DWORD(tre, 1) >> 16) & 0xFF)
/* Event descriptor macros */
-#define MHI_TRE_EV_PTR(ptr) (ptr)
-#define MHI_TRE_EV_DWORD0(code, len) ((code << 24) | len)
-#define MHI_TRE_EV_DWORD1(chid, type) ((chid << 24) | (type << 16))
-#define MHI_TRE_GET_EV_PTR(tre) ((tre)->ptr)
-#define MHI_TRE_GET_EV_CODE(tre) (((tre)->dword[0] >> 24) & 0xFF)
-#define MHI_TRE_GET_EV_LEN(tre) ((tre)->dword[0] & 0xFFFF)
-#define MHI_TRE_GET_EV_CHID(tre) (((tre)->dword[1] >> 24) & 0xFF)
-#define MHI_TRE_GET_EV_TYPE(tre) (((tre)->dword[1] >> 16) & 0xFF)
-#define MHI_TRE_GET_EV_STATE(tre) (((tre)->dword[0] >> 24) & 0xFF)
-#define MHI_TRE_GET_EV_EXECENV(tre) (((tre)->dword[0] >> 24) & 0xFF)
-#define MHI_TRE_GET_EV_SEQ(tre) ((tre)->dword[0])
-#define MHI_TRE_GET_EV_TIME(tre) ((tre)->ptr)
-#define MHI_TRE_GET_EV_COOKIE(tre) lower_32_bits((tre)->ptr)
-#define MHI_TRE_GET_EV_VEID(tre) (((tre)->dword[0] >> 16) & 0xFF)
-#define MHI_TRE_GET_EV_LINKSPEED(tre) (((tre)->dword[1] >> 24) & 0xFF)
-#define MHI_TRE_GET_EV_LINKWIDTH(tre) ((tre)->dword[0] & 0xFF)
+#define MHI_TRE_EV_PTR(ptr) (cpu_to_le64(ptr))
+#define MHI_TRE_EV_DWORD0(code, len) (cpu_to_le32((code << 24) | len))
+#define MHI_TRE_EV_DWORD1(chid, type) (cpu_to_le32((chid << 24) | (type << 16)))
+#define MHI_TRE_GET_EV_PTR(tre) (le64_to_cpu((tre)->ptr))
+#define MHI_TRE_GET_EV_CODE(tre) ((MHI_TRE_GET_DWORD(tre, 0) >> 24) & 0xFF)
+#define MHI_TRE_GET_EV_LEN(tre) (MHI_TRE_GET_DWORD(tre, 0) & 0xFFFF)
+#define MHI_TRE_GET_EV_CHID(tre) ((MHI_TRE_GET_DWORD(tre, 1) >> 24) & 0xFF)
+#define MHI_TRE_GET_EV_TYPE(tre) ((MHI_TRE_GET_DWORD(tre, 1) >> 16) & 0xFF)
+#define MHI_TRE_GET_EV_STATE(tre) ((MHI_TRE_GET_DWORD(tre, 0) >> 24) & 0xFF)
+#define MHI_TRE_GET_EV_EXECENV(tre) ((MHI_TRE_GET_DWORD(tre, 0) >> 24) & 0xFF)
+#define MHI_TRE_GET_EV_SEQ(tre) MHI_TRE_GET_DWORD(tre, 0)
+#define MHI_TRE_GET_EV_TIME(tre) (MHI_TRE_GET_EV_PTR(tre))
+#define MHI_TRE_GET_EV_COOKIE(tre) lower_32_bits(MHI_TRE_GET_EV_PTR(tre))
+#define MHI_TRE_GET_EV_VEID(tre) ((MHI_TRE_GET_DWORD(tre, 0) >> 16) & 0xFF)
+#define MHI_TRE_GET_EV_LINKSPEED(tre) ((MHI_TRE_GET_DWORD(tre, 1) >> 24) & 0xFF)
+#define MHI_TRE_GET_EV_LINKWIDTH(tre) (MHI_TRE_GET_DWORD(tre, 0) & 0xFF)
/* Transfer descriptor macros */
-#define MHI_TRE_DATA_PTR(ptr) (ptr)
-#define MHI_TRE_DATA_DWORD0(len) (len & MHI_MAX_MTU)
-#define MHI_TRE_DATA_DWORD1(bei, ieot, ieob, chain) ((2 << 16) | (bei << 10) \
- | (ieot << 9) | (ieob << 8) | chain)
+#define MHI_TRE_DATA_PTR(ptr) (cpu_to_le64(ptr))
+#define MHI_TRE_DATA_DWORD0(len) (cpu_to_le32(len & MHI_MAX_MTU))
+#define MHI_TRE_DATA_DWORD1(bei, ieot, ieob, chain) (cpu_to_le32((2 << 16) | (bei << 10) \
+ | (ieot << 9) | (ieob << 8) | chain))
/* RSC transfer descriptor macros */
-#define MHI_RSCTRE_DATA_PTR(ptr, len) (((u64)len << 48) | ptr)
-#define MHI_RSCTRE_DATA_DWORD0(cookie) (cookie)
-#define MHI_RSCTRE_DATA_DWORD1 (MHI_PKT_TYPE_COALESCING << 16)
+#define MHI_RSCTRE_DATA_PTR(ptr, len) (cpu_to_le64(((u64)len << 48) | ptr))
+#define MHI_RSCTRE_DATA_DWORD0(cookie) (cpu_to_le32(cookie))
+#define MHI_RSCTRE_DATA_DWORD1 (cpu_to_le32(MHI_PKT_TYPE_COALESCING << 16))
enum mhi_pkt_type {
MHI_PKT_TYPE_INVALID = 0x0,
@@ -480,10 +481,10 @@ struct db_cfg {
bool db_mode;
u32 pollcfg;
enum mhi_db_brst_mode brstmode;
- dma_addr_t db_val;
+ __le64 db_val;
void (*process_db)(struct mhi_controller *mhi_cntrl,
struct db_cfg *db_cfg, void __iomem *io_addr,
- dma_addr_t db_val);
+ __le64 db_val);
};
struct mhi_pm_transitions {
@@ -499,7 +500,7 @@ struct state_transition {
struct mhi_ring {
dma_addr_t dma_handle;
dma_addr_t iommu_base;
- u64 *ctxt_wp; /* point to ctxt wp */
+ __le64 *ctxt_wp; /* point to ctxt wp */
void *pre_aligned;
void *base;
void *rp;
@@ -649,10 +650,10 @@ static inline void mhi_trigger_resume(struct mhi_controller *mhi_cntrl)
/* Register access methods */
void mhi_db_brstmode(struct mhi_controller *mhi_cntrl, struct db_cfg *db_cfg,
- void __iomem *db_addr, dma_addr_t db_val);
+ void __iomem *db_addr, __le64 db_val);
void mhi_db_brstmode_disable(struct mhi_controller *mhi_cntrl,
struct db_cfg *db_mode, void __iomem *db_addr,
- dma_addr_t db_val);
+ __le64 db_val);
int __must_check mhi_read_reg(struct mhi_controller *mhi_cntrl,
void __iomem *base, u32 offset, u32 *out);
int __must_check mhi_read_reg_field(struct mhi_controller *mhi_cntrl,
@@ -667,7 +668,7 @@ void mhi_write_reg_field(struct mhi_controller *mhi_cntrl, void __iomem *base,
u32 offset, u32 mask, u32 shift, u32 val);
void mhi_ring_er_db(struct mhi_event *mhi_event);
void mhi_write_db(struct mhi_controller *mhi_cntrl, void __iomem *db_addr,
- dma_addr_t db_val);
+ __le64 db_val);
void mhi_ring_cmd_db(struct mhi_controller *mhi_cntrl, struct mhi_cmd *mhi_cmd);
void mhi_ring_chan_db(struct mhi_controller *mhi_cntrl,
struct mhi_chan *mhi_chan);
diff --git a/drivers/bus/mhi/core/main.c b/drivers/bus/mhi/core/main.c
index 8ac73f9e92a6..a8c68220d764 100644
--- a/drivers/bus/mhi/core/main.c
+++ b/drivers/bus/mhi/core/main.c
@@ -82,16 +82,18 @@ void mhi_write_reg_field(struct mhi_controller *mhi_cntrl, void __iomem *base,
}
void mhi_write_db(struct mhi_controller *mhi_cntrl, void __iomem *db_addr,
- dma_addr_t db_val)
+ __le64 db_val)
{
- mhi_write_reg(mhi_cntrl, db_addr, 4, upper_32_bits(db_val));
- mhi_write_reg(mhi_cntrl, db_addr, 0, lower_32_bits(db_val));
+ dma_addr_t tmp = le64_to_cpu(db_val);
+
+ mhi_write_reg(mhi_cntrl, db_addr, 4, upper_32_bits(tmp));
+ mhi_write_reg(mhi_cntrl, db_addr, 0, lower_32_bits(tmp));
}
void mhi_db_brstmode(struct mhi_controller *mhi_cntrl,
struct db_cfg *db_cfg,
void __iomem *db_addr,
- dma_addr_t db_val)
+ __le64 db_val)
{
if (db_cfg->db_mode) {
db_cfg->db_val = db_val;
@@ -103,7 +105,7 @@ void mhi_db_brstmode(struct mhi_controller *mhi_cntrl,
void mhi_db_brstmode_disable(struct mhi_controller *mhi_cntrl,
struct db_cfg *db_cfg,
void __iomem *db_addr,
- dma_addr_t db_val)
+ __le64 db_val)
{
db_cfg->db_val = db_val;
mhi_write_db(mhi_cntrl, db_addr, db_val);
@@ -119,10 +121,10 @@ void mhi_ring_er_db(struct mhi_event *mhi_event)
void mhi_ring_cmd_db(struct mhi_controller *mhi_cntrl, struct mhi_cmd *mhi_cmd)
{
- dma_addr_t db;
+ __le64 db;
struct mhi_ring *ring = &mhi_cmd->ring;
- db = ring->iommu_base + (ring->wp - ring->base);
+ db = cpu_to_le64(ring->iommu_base + (ring->wp - ring->base));
*ring->ctxt_wp = db;
mhi_write_db(mhi_cntrl, ring->db_addr, db);
}
@@ -131,9 +133,9 @@ void mhi_ring_chan_db(struct mhi_controller *mhi_cntrl,
struct mhi_chan *mhi_chan)
{
struct mhi_ring *ring = &mhi_chan->tre_ring;
- dma_addr_t db;
+ __le64 db;
- db = ring->iommu_base + (ring->wp - ring->base);
+ db = cpu_to_le64(ring->iommu_base + (ring->wp - ring->base));
/*
* Writes to the new ring element must be visible to the hardware
@@ -432,7 +434,7 @@ irqreturn_t mhi_irq_handler(int irq_number, void *dev)
struct mhi_event_ctxt *er_ctxt =
&mhi_cntrl->mhi_ctxt->er_ctxt[mhi_event->er_index];
struct mhi_ring *ev_ring = &mhi_event->ring;
- dma_addr_t ptr = er_ctxt->rp;
+ dma_addr_t ptr = le64_to_cpu(er_ctxt->rp);
void *dev_rp;
if (!is_valid_ring_ptr(ev_ring, ptr)) {
@@ -537,14 +539,14 @@ static void mhi_recycle_ev_ring_element(struct mhi_controller *mhi_cntrl,
/* Update the WP */
ring->wp += ring->el_size;
- ctxt_wp = *ring->ctxt_wp + ring->el_size;
+ ctxt_wp = le64_to_cpu(*ring->ctxt_wp) + ring->el_size;
if (ring->wp >= (ring->base + ring->len)) {
ring->wp = ring->base;
ctxt_wp = ring->iommu_base;
}
- *ring->ctxt_wp = ctxt_wp;
+ *ring->ctxt_wp = cpu_to_le64(ctxt_wp);
/* Update the RP */
ring->rp += ring->el_size;
@@ -799,7 +801,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl,
struct device *dev = &mhi_cntrl->mhi_dev->dev;
u32 chan;
int count = 0;
- dma_addr_t ptr = er_ctxt->rp;
+ dma_addr_t ptr = le64_to_cpu(er_ctxt->rp);
/*
* This is a quick check to avoid unnecessary event processing
@@ -938,7 +940,7 @@ int mhi_process_ctrl_ev_ring(struct mhi_controller *mhi_cntrl,
mhi_recycle_ev_ring_element(mhi_cntrl, ev_ring);
local_rp = ev_ring->rp;
- ptr = er_ctxt->rp;
+ ptr = le64_to_cpu(er_ctxt->rp);
if (!is_valid_ring_ptr(ev_ring, ptr)) {
dev_err(&mhi_cntrl->mhi_dev->dev,
"Event ring rp points outside of the event ring\n");
@@ -968,7 +970,7 @@ int mhi_process_data_event_ring(struct mhi_controller *mhi_cntrl,
int count = 0;
u32 chan;
struct mhi_chan *mhi_chan;
- dma_addr_t ptr = er_ctxt->rp;
+ dma_addr_t ptr = le64_to_cpu(er_ctxt->rp);
if (unlikely(MHI_EVENT_ACCESS_INVALID(mhi_cntrl->pm_state)))
return -EIO;
@@ -1009,7 +1011,7 @@ int mhi_process_data_event_ring(struct mhi_controller *mhi_cntrl,
mhi_recycle_ev_ring_element(mhi_cntrl, ev_ring);
local_rp = ev_ring->rp;
- ptr = er_ctxt->rp;
+ ptr = le64_to_cpu(er_ctxt->rp);
if (!is_valid_ring_ptr(ev_ring, ptr)) {
dev_err(&mhi_cntrl->mhi_dev->dev,
"Event ring rp points outside of the event ring\n");
@@ -1531,7 +1533,7 @@ static void mhi_mark_stale_events(struct mhi_controller *mhi_cntrl,
/* mark all stale events related to channel as STALE event */
spin_lock_irqsave(&mhi_event->lock, flags);
- ptr = er_ctxt->rp;
+ ptr = le64_to_cpu(er_ctxt->rp);
if (!is_valid_ring_ptr(ev_ring, ptr)) {
dev_err(&mhi_cntrl->mhi_dev->dev,
"Event ring rp points outside of the event ring\n");
diff --git a/drivers/bus/mhi/core/pm.c b/drivers/bus/mhi/core/pm.c
index bbf6cd04861e..0faf173fb963 100644
--- a/drivers/bus/mhi/core/pm.c
+++ b/drivers/bus/mhi/core/pm.c
@@ -218,7 +218,7 @@ int mhi_ready_state_transition(struct mhi_controller *mhi_cntrl)
continue;
ring->wp = ring->base + ring->len - ring->el_size;
- *ring->ctxt_wp = ring->iommu_base + ring->len - ring->el_size;
+ *ring->ctxt_wp = cpu_to_le64(ring->iommu_base + ring->len - ring->el_size);
/* Update all cores */
smp_wmb();
@@ -420,7 +420,7 @@ static int mhi_pm_mission_mode_transition(struct mhi_controller *mhi_cntrl)
continue;
ring->wp = ring->base + ring->len - ring->el_size;
- *ring->ctxt_wp = ring->iommu_base + ring->len - ring->el_size;
+ *ring->ctxt_wp = cpu_to_le64(ring->iommu_base + ring->len - ring->el_size);
/* Update to all cores */
smp_wmb();
@@ -986,7 +986,7 @@ static void mhi_assert_dev_wake(struct mhi_controller *mhi_cntrl, bool force)
atomic_inc(&mhi_cntrl->dev_wake);
if (MHI_WAKE_DB_FORCE_SET_VALID(mhi_cntrl->pm_state) &&
!mhi_cntrl->wake_set) {
- mhi_write_db(mhi_cntrl, mhi_cntrl->wake_db, 1);
+ mhi_write_db(mhi_cntrl, mhi_cntrl->wake_db, cpu_to_le64(1));
mhi_cntrl->wake_set = true;
}
spin_unlock_irqrestore(&mhi_cntrl->wlock, flags);
@@ -1002,7 +1002,7 @@ static void mhi_assert_dev_wake(struct mhi_controller *mhi_cntrl, bool force)
if ((atomic_inc_return(&mhi_cntrl->dev_wake) == 1) &&
MHI_WAKE_DB_SET_VALID(mhi_cntrl->pm_state) &&
!mhi_cntrl->wake_set) {
- mhi_write_db(mhi_cntrl, mhi_cntrl->wake_db, 1);
+ mhi_write_db(mhi_cntrl, mhi_cntrl->wake_db, cpu_to_le64(1));
mhi_cntrl->wake_set = true;
}
spin_unlock_irqrestore(&mhi_cntrl->wlock, flags);
--
2.32.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-06-25 20:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-25 20:20 [PATCH v2 2/2] bus: mhi: Fix MHI DMA structure endianness kernel test robot
-- strict thread matches above, loose matches on Subject: below --
2021-06-23 2:43 [PATCH v2 0/2] bus: mhi: Fix MHI on big endian architectures Paul Davey
2021-06-23 2:43 ` [PATCH v2 2/2] bus: mhi: Fix MHI DMA structure endianness Paul Davey
2021-06-24 2:11 ` Bhaumik Bhatt
2021-06-24 23:12 ` Paul Davey
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.