| Message ID | 20240810214621.14417-3-florian.fainelli@broadcom.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Support for I/O width within ARM SCMI SHMEM | expand |
On 8/10/2024 2:46 PM, Florian Fainelli wrote: > Some shared memory areas might only support a certain access width, > (e.g.: 32 bits accesses only). Update the shmem layer to support > reading from and writing to such shared memory area using the specified > I/O width in the Device Tree. The various transport layers making use of > the shmem.c code are updated accordingly to pass the I/O width to the > routines that need it. > > Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> Doing a self review, though I will only resend after collecting additional feedback. > --- > drivers/firmware/arm_scmi/common.h | 14 +++- > .../arm_scmi/scmi_transport_mailbox.c | 12 ++- > .../firmware/arm_scmi/scmi_transport_optee.c | 7 +- > .../firmware/arm_scmi/scmi_transport_smc.c | 10 ++- > drivers/firmware/arm_scmi/shmem.c | 77 ++++++++++++++++--- > 5 files changed, 96 insertions(+), 24 deletions(-) > > diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h > index 69928bbd01c2..97dae844a190 100644 > --- a/drivers/firmware/arm_scmi/common.h > +++ b/drivers/firmware/arm_scmi/common.h > @@ -170,6 +170,7 @@ void scmi_protocol_release(const struct scmi_handle *handle, u8 protocol_id); > * This can be dynamically set by transports at run-time > * inside their provided .chan_setup(). > * @transport_info: Transport layer related information > + * @shmem_io_width: I/O width in bytes of the shared memory area > */ > struct scmi_chan_info { > int id; > @@ -178,6 +179,7 @@ struct scmi_chan_info { > struct scmi_handle *handle; > bool no_completion_irq; > void *transport_info; > + u32 shmem_io_width; This is not used because the individual transports store the shmem_io_width in their own transport_info structure. [snip] > > +#define __shmem_copy_toio_tpl(s) \ > + for (unsigned int i = 0; i < xfer->tx.len; i += shmem_io_width) \ > + iowrite##s(((u##s *)(xfer->tx.buf))[i / shmem_io_width], \ > + shmem->msg_payload + i); > + > +#define __shmem_copy_fromio_tpl(s) \ > + for (unsigned int i = 0; i < xfer->rx.len; i += shmem_io_width) \ > + ((u##s *)(xfer->rx.buf))[i / shmem_io_width] = \ > + ioread##s(shmem->msg_payload + shmem_io_width + i); This needs to be shmem->msg_payload + 4 + i. This worked in my testing because I was precisely tseting with 'reg-io-width = <4>'. [snip] > > static u32 shmem_read_header(struct scmi_shared_mem __iomem *shmem) > @@ -81,8 +109,34 @@ static u32 shmem_read_header(struct scmi_shared_mem __iomem *shmem) > return ioread32(&shmem->msg_header); > } > > +static void __shmem_fetch_resp_notif_data(struct scmi_xfer *xfer, > + struct scmi_shared_mem __iomem *shmem, > + u32 shmem_io_width) > +{ > + /* Take a copy to the rx buffer.. */ > + switch (shmem_io_width) { > + case 1: > + __shmem_copy_fromio_tpl(8); > + break; > + case 2: > + __shmem_copy_fromio_tpl(16); > + break; > + case 4: > + __shmem_copy_fromio_tpl(32); > + break; > + case 8: > + __shmem_copy_fromio_tpl(32); This should be 64 and it looks like ioread64/iowrite64 is not necessarily defined for 32-bit configurations, so this needs to be gated with a CONFIG_64BIT define here since ioread64/iowrite64 in include/asm-generic/io.h is defined that way.
Hi Florian,
kernel test robot noticed the following build errors:
[auto build test ERROR on next-20240809]
[cannot apply to robh/for-next soc/for-next linus/master v6.11-rc2 v6.11-rc1 v6.10 v6.11-rc2]
[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#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Florian-Fainelli/dt-bindings-sram-Document-reg-io-width-property/20240811-055659
base: next-20240809
patch link: https://lore.kernel.org/r/20240810214621.14417-3-florian.fainelli%40broadcom.com
patch subject: [PATCH 2/2] firmware: arm_scmi: Support 'reg-io-width' property for shared memory
config: hexagon-allmodconfig (https://download.01.org/0day-ci/archive/20240811/202408112059.XkTMhslU-lkp@intel.com/config)
compiler: clang version 20.0.0git (https://github.com/llvm/llvm-project f86594788ce93b696675c94f54016d27a6c21d18)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240811/202408112059.XkTMhslU-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202408112059.XkTMhslU-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from drivers/firmware/arm_scmi/shmem.c:9:
In file included from include/linux/io.h:14:
In file included from arch/hexagon/include/asm/io.h:328:
include/asm-generic/io.h:548:31: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
548 | val = __raw_readb(PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:561:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
561 | val = __le16_to_cpu((__le16 __force)__raw_readw(PCI_IOBASE + addr));
| ~~~~~~~~~~ ^
include/uapi/linux/byteorder/little_endian.h:37:51: note: expanded from macro '__le16_to_cpu'
37 | #define __le16_to_cpu(x) ((__force __u16)(__le16)(x))
| ^
In file included from drivers/firmware/arm_scmi/shmem.c:9:
In file included from include/linux/io.h:14:
In file included from arch/hexagon/include/asm/io.h:328:
include/asm-generic/io.h:574:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
574 | val = __le32_to_cpu((__le32 __force)__raw_readl(PCI_IOBASE + addr));
| ~~~~~~~~~~ ^
include/uapi/linux/byteorder/little_endian.h:35:51: note: expanded from macro '__le32_to_cpu'
35 | #define __le32_to_cpu(x) ((__force __u32)(__le32)(x))
| ^
In file included from drivers/firmware/arm_scmi/shmem.c:9:
In file included from include/linux/io.h:14:
In file included from arch/hexagon/include/asm/io.h:328:
include/asm-generic/io.h:585:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
585 | __raw_writeb(value, PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:595:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
595 | __raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:605:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
605 | __raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
>> drivers/firmware/arm_scmi/shmem.c:98:4: error: call to undeclared function 'iowrite64'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
98 | __shmem_copy_toio_tpl(64);
| ^
drivers/firmware/arm_scmi/shmem.c:39:3: note: expanded from macro '__shmem_copy_toio_tpl'
39 | iowrite##s(((u##s *)(xfer->tx.buf))[i / shmem_io_width], \
| ^
<scratch space>:43:1: note: expanded from here
43 | iowrite64
| ^
6 warnings and 1 error generated.
vim +/iowrite64 +98 drivers/firmware/arm_scmi/shmem.c
36
37 #define __shmem_copy_toio_tpl(s) \
38 for (unsigned int i = 0; i < xfer->tx.len; i += shmem_io_width) \
39 iowrite##s(((u##s *)(xfer->tx.buf))[i / shmem_io_width], \
40 shmem->msg_payload + i);
41
42 #define __shmem_copy_fromio_tpl(s) \
43 for (unsigned int i = 0; i < xfer->rx.len; i += shmem_io_width) \
44 ((u##s *)(xfer->rx.buf))[i / shmem_io_width] = \
45 ioread##s(shmem->msg_payload + shmem_io_width + i);
46
47 static void shmem_tx_prepare(struct scmi_shared_mem __iomem *shmem,
48 struct scmi_xfer *xfer,
49 struct scmi_chan_info *cinfo,
50 u32 shmem_io_width)
51 {
52 ktime_t stop;
53
54 /*
55 * Ideally channel must be free by now unless OS timeout last
56 * request and platform continued to process the same, wait
57 * until it releases the shared memory, otherwise we may endup
58 * overwriting its response with new message payload or vice-versa.
59 * Giving up anyway after twice the expected channel timeout so as
60 * not to bail-out on intermittent issues where the platform is
61 * occasionally a bit slower to answer.
62 *
63 * Note that after a timeout is detected we bail-out and carry on but
64 * the transport functionality is probably permanently compromised:
65 * this is just to ease debugging and avoid complete hangs on boot
66 * due to a misbehaving SCMI firmware.
67 */
68 stop = ktime_add_ms(ktime_get(), 2 * cinfo->rx_timeout_ms);
69 spin_until_cond((ioread32(&shmem->channel_status) &
70 SCMI_SHMEM_CHAN_STAT_CHANNEL_FREE) ||
71 ktime_after(ktime_get(), stop));
72 if (!(ioread32(&shmem->channel_status) &
73 SCMI_SHMEM_CHAN_STAT_CHANNEL_FREE)) {
74 WARN_ON_ONCE(1);
75 dev_err(cinfo->dev,
76 "Timeout waiting for a free TX channel !\n");
77 return;
78 }
79
80 /* Mark channel busy + clear error */
81 iowrite32(0x0, &shmem->channel_status);
82 iowrite32(xfer->hdr.poll_completion ? 0 : SCMI_SHMEM_FLAG_INTR_ENABLED,
83 &shmem->flags);
84 iowrite32(sizeof(shmem->msg_header) + xfer->tx.len, &shmem->length);
85 iowrite32(pack_scmi_header(&xfer->hdr), &shmem->msg_header);
86 if (xfer->tx.buf) {
87 switch (shmem_io_width) {
88 case 1:
89 __shmem_copy_toio_tpl(8);
90 break;
91 case 2:
92 __shmem_copy_toio_tpl(16);
93 break;
94 case 4:
95 __shmem_copy_toio_tpl(32);
96 break;
97 case 8:
> 98 __shmem_copy_toio_tpl(64);
99 break;
100 default:
101 memcpy_toio(shmem->msg_payload, xfer->tx.buf, xfer->tx.len);
102 break;
103 }
104 }
105 }
106
Hi Florian,
kernel test robot noticed the following build warnings:
[auto build test WARNING on next-20240809]
[cannot apply to robh/for-next soc/for-next linus/master v6.11-rc2 v6.11-rc1 v6.10 v6.11-rc2]
[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#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Florian-Fainelli/dt-bindings-sram-Document-reg-io-width-property/20240811-055659
base: next-20240809
patch link: https://lore.kernel.org/r/20240810214621.14417-3-florian.fainelli%40broadcom.com
patch subject: [PATCH 2/2] firmware: arm_scmi: Support 'reg-io-width' property for shared memory
config: alpha-allyesconfig (https://download.01.org/0day-ci/archive/20240811/202408112059.t5hPmQeS-lkp@intel.com/config)
compiler: alpha-linux-gcc (GCC) 13.3.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240811/202408112059.t5hPmQeS-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202408112059.t5hPmQeS-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> drivers/firmware/arm_scmi/scmi_transport_mailbox.c:37: warning: Function parameter or struct member 'shmem_io_width' not described in 'scmi_mailbox'
vim +37 drivers/firmware/arm_scmi/scmi_transport_mailbox.c
5c8a47a5a91d4d drivers/firmware/arm_scmi/mailbox.c Viresh Kumar 2020-01-31 18
5c8a47a5a91d4d drivers/firmware/arm_scmi/mailbox.c Viresh Kumar 2020-01-31 19 /**
5c8a47a5a91d4d drivers/firmware/arm_scmi/mailbox.c Viresh Kumar 2020-01-31 20 * struct scmi_mailbox - Structure representing a SCMI mailbox transport
5c8a47a5a91d4d drivers/firmware/arm_scmi/mailbox.c Viresh Kumar 2020-01-31 21 *
5c8a47a5a91d4d drivers/firmware/arm_scmi/mailbox.c Viresh Kumar 2020-01-31 22 * @cl: Mailbox Client
9f68ff79ec2cb3 drivers/firmware/arm_scmi/mailbox.c Cristian Marussi 2023-04-04 23 * @chan: Transmit/Receive mailbox uni/bi-directional channel
9f68ff79ec2cb3 drivers/firmware/arm_scmi/mailbox.c Cristian Marussi 2023-04-04 24 * @chan_receiver: Optional Receiver mailbox unidirectional channel
fa8b28ba22d95b drivers/firmware/arm_scmi/mailbox.c Peng Fan 2024-05-10 25 * @chan_platform_receiver: Optional Platform Receiver mailbox unidirectional channel
5c8a47a5a91d4d drivers/firmware/arm_scmi/mailbox.c Viresh Kumar 2020-01-31 26 * @cinfo: SCMI channel info
5c8a47a5a91d4d drivers/firmware/arm_scmi/mailbox.c Viresh Kumar 2020-01-31 27 * @shmem: Transmit/Receive shared memory area
5c8a47a5a91d4d drivers/firmware/arm_scmi/mailbox.c Viresh Kumar 2020-01-31 28 */
5c8a47a5a91d4d drivers/firmware/arm_scmi/mailbox.c Viresh Kumar 2020-01-31 29 struct scmi_mailbox {
5c8a47a5a91d4d drivers/firmware/arm_scmi/mailbox.c Viresh Kumar 2020-01-31 30 struct mbox_client cl;
5c8a47a5a91d4d drivers/firmware/arm_scmi/mailbox.c Viresh Kumar 2020-01-31 31 struct mbox_chan *chan;
9f68ff79ec2cb3 drivers/firmware/arm_scmi/mailbox.c Cristian Marussi 2023-04-04 32 struct mbox_chan *chan_receiver;
fa8b28ba22d95b drivers/firmware/arm_scmi/mailbox.c Peng Fan 2024-05-10 33 struct mbox_chan *chan_platform_receiver;
5c8a47a5a91d4d drivers/firmware/arm_scmi/mailbox.c Viresh Kumar 2020-01-31 34 struct scmi_chan_info *cinfo;
5c8a47a5a91d4d drivers/firmware/arm_scmi/mailbox.c Viresh Kumar 2020-01-31 35 struct scmi_shared_mem __iomem *shmem;
0905440d6ece25 drivers/firmware/arm_scmi/scmi_transport_mailbox.c Florian Fainelli 2024-08-10 36 u32 shmem_io_width;
5c8a47a5a91d4d drivers/firmware/arm_scmi/mailbox.c Viresh Kumar 2020-01-31 @37 };
5c8a47a5a91d4d drivers/firmware/arm_scmi/mailbox.c Viresh Kumar 2020-01-31 38
Hi Florian, kernel test robot noticed the following build errors: [auto build test ERROR on next-20240809] [cannot apply to robh/for-next soc/for-next linus/master v6.11-rc2 v6.11-rc1 v6.10 v6.11-rc2] [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#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Florian-Fainelli/dt-bindings-sram-Document-reg-io-width-property/20240811-055659 base: next-20240809 patch link: https://lore.kernel.org/r/20240810214621.14417-3-florian.fainelli%40broadcom.com patch subject: [PATCH 2/2] firmware: arm_scmi: Support 'reg-io-width' property for shared memory config: sh-allmodconfig (https://download.01.org/0day-ci/archive/20240811/202408112013.dn8y7Fg4-lkp@intel.com/config) compiler: sh4-linux-gcc (GCC) 14.1.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240811/202408112013.dn8y7Fg4-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202408112013.dn8y7Fg4-lkp@intel.com/ All errors (new ones prefixed by >>): drivers/firmware/arm_scmi/shmem.c: In function 'shmem_tx_prepare': >> drivers/firmware/arm_scmi/shmem.c:39:17: error: implicit declaration of function 'iowrite64'; did you mean 'iowrite32'? [-Wimplicit-function-declaration] 39 | iowrite##s(((u##s *)(xfer->tx.buf))[i / shmem_io_width], \ | ^~~~~~~ drivers/firmware/arm_scmi/shmem.c:98:25: note: in expansion of macro '__shmem_copy_toio_tpl' 98 | __shmem_copy_toio_tpl(64); | ^~~~~~~~~~~~~~~~~~~~~ vim +39 drivers/firmware/arm_scmi/shmem.c 36 37 #define __shmem_copy_toio_tpl(s) \ 38 for (unsigned int i = 0; i < xfer->tx.len; i += shmem_io_width) \ > 39 iowrite##s(((u##s *)(xfer->tx.buf))[i / shmem_io_width], \ 40 shmem->msg_payload + i); 41
> Subject: [PATCH 2/2] firmware: arm_scmi: Support 'reg-io-width' > property for shared memory > > Some shared memory areas might only support a certain access width, > (e.g.: 32 bits accesses only). Update the shmem layer to support > reading from and writing to such shared memory area using the > specified I/O width in the Device Tree. The various transport layers > making use of the shmem.c code are updated accordingly to pass the > I/O width to the routines that need it. > > Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> > --- [...] > } > > static void smc_mark_txdone(struct scmi_chan_info *cinfo, int ret, diff > --git a/drivers/firmware/arm_scmi/shmem.c > b/drivers/firmware/arm_scmi/shmem.c > index 01d8a9398fe8..192262d63baa 100644 > --- a/drivers/firmware/arm_scmi/shmem.c > +++ b/drivers/firmware/arm_scmi/shmem.c > @@ -34,9 +34,20 @@ struct scmi_shared_mem { > u8 msg_payload[]; > }; > > +#define __shmem_copy_toio_tpl(s) \ > + for (unsigned int i = 0; i < xfer->tx.len; i += shmem_io_width) > \ > + iowrite##s(((u##s *)(xfer->tx.buf))[i / shmem_io_width], > \ > + shmem->msg_payload + i); there will be a barrier with iowrite, use raw_write##s? > + > +#define __shmem_copy_fromio_tpl(s) \ > + for (unsigned int i = 0; i < xfer->rx.len; i += shmem_io_width) > \ > + ((u##s *)(xfer->rx.buf))[i / shmem_io_width] = > \ > + ioread##s(shmem->msg_payload + > shmem_io_width + i); Use raw_ioread##s? Regards, Peng.
On 8/11/2024 5:42 AM, Peng Fan wrote: >> Subject: [PATCH 2/2] firmware: arm_scmi: Support 'reg-io-width' >> property for shared memory >> >> Some shared memory areas might only support a certain access width, >> (e.g.: 32 bits accesses only). Update the shmem layer to support >> reading from and writing to such shared memory area using the >> specified I/O width in the Device Tree. The various transport layers >> making use of the shmem.c code are updated accordingly to pass the >> I/O width to the routines that need it. >> >> Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> >> --- > > [...] >> } >> >> static void smc_mark_txdone(struct scmi_chan_info *cinfo, int ret, diff >> --git a/drivers/firmware/arm_scmi/shmem.c >> b/drivers/firmware/arm_scmi/shmem.c >> index 01d8a9398fe8..192262d63baa 100644 >> --- a/drivers/firmware/arm_scmi/shmem.c >> +++ b/drivers/firmware/arm_scmi/shmem.c >> @@ -34,9 +34,20 @@ struct scmi_shared_mem { >> u8 msg_payload[]; >> }; >> >> +#define __shmem_copy_toio_tpl(s) \ >> + for (unsigned int i = 0; i < xfer->tx.len; i += shmem_io_width) >> \ >> + iowrite##s(((u##s *)(xfer->tx.buf))[i / shmem_io_width], >> \ >> + shmem->msg_payload + i); > > there will be a barrier with iowrite, use raw_write##s? Makes sense, and that matches what memcpy_{from,to}_io() does, too. > >> + >> +#define __shmem_copy_fromio_tpl(s) \ >> + for (unsigned int i = 0; i < xfer->rx.len; i += shmem_io_width) >> \ >> + ((u##s *)(xfer->rx.buf))[i / shmem_io_width] = >> \ >> + ioread##s(shmem->msg_payload + >> shmem_io_width + i); > > Use raw_ioread##s? Agreed.
On 8/10/2024 2:46 PM, Florian Fainelli wrote: > Some shared memory areas might only support a certain access width, > (e.g.: 32 bits accesses only). Update the shmem layer to support > reading from and writing to such shared memory area using the specified > I/O width in the Device Tree. The various transport layers making use of > the shmem.c code are updated accordingly to pass the I/O width to the > routines that need it. > > Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> > --- [snip] > static void shmem_fetch_response(struct scmi_shared_mem __iomem *shmem, > - struct scmi_xfer *xfer) > + struct scmi_xfer *xfer, > + u32 shmem_io_width) > { > size_t len = ioread32(&shmem->length); > > @@ -90,20 +144,19 @@ static void shmem_fetch_response(struct scmi_shared_mem __iomem *shmem, > /* Skip the length of header and status in shmem area i.e 8 bytes */ > xfer->rx.len = min_t(size_t, xfer->rx.len, len > 8 ? len - 8 : 0); > > - /* Take a copy to the rx buffer.. */ > - memcpy_fromio(xfer->rx.buf, shmem->msg_payload + 4, xfer->rx.len); > + __shmem_fetch_resp_notif_data(xfer, shmem, shmem_io_width); As Justin pointed out to me separately, the source pointer is different for response and notifications, will fix that, too.
On Sat, Aug 10, 2024 at 02:46:21PM -0700, Florian Fainelli wrote: > Some shared memory areas might only support a certain access width, > (e.g.: 32 bits accesses only). Update the shmem layer to support > reading from and writing to such shared memory area using the specified > I/O width in the Device Tree. The various transport layers making use of > the shmem.c code are updated accordingly to pass the I/O width to the > routines that need it. Hi Florian, I only glanced quicky through the series...a few remarks below. > > Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> > --- > drivers/firmware/arm_scmi/common.h | 14 +++- > .../arm_scmi/scmi_transport_mailbox.c | 12 ++- > .../firmware/arm_scmi/scmi_transport_optee.c | 7 +- > .../firmware/arm_scmi/scmi_transport_smc.c | 10 ++- > drivers/firmware/arm_scmi/shmem.c | 77 ++++++++++++++++--- > 5 files changed, 96 insertions(+), 24 deletions(-) > > diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h > index 69928bbd01c2..97dae844a190 100644 > --- a/drivers/firmware/arm_scmi/common.h > +++ b/drivers/firmware/arm_scmi/common.h > @@ -170,6 +170,7 @@ void scmi_protocol_release(const struct scmi_handle *handle, u8 protocol_id); > * This can be dynamically set by transports at run-time > * inside their provided .chan_setup(). > * @transport_info: Transport layer related information > + * @shmem_io_width: I/O width in bytes of the shared memory area > */ > struct scmi_chan_info { > int id; > @@ -178,6 +179,7 @@ struct scmi_chan_info { > struct scmi_handle *handle; > bool no_completion_irq; > void *transport_info; > + u32 shmem_io_width; > }; As you said you dont need this if you embed it inside the transpor_info...but... > > /** > @@ -336,13 +338,16 @@ struct scmi_shared_mem; > struct scmi_shared_mem_operations { > void (*tx_prepare)(struct scmi_shared_mem __iomem *shmem, > struct scmi_xfer *xfer, > - struct scmi_chan_info *cinfo); > + struct scmi_chan_info *cinfo, > + u32 shmem_io_width); ...maybe also you dont need this additional parameters if you setup upfront the shmem ops to operate ONLY on the configured size... ...I mean all of this seems to be a one-shot setup procedure so it would be sensible to just configuire the shmem ops pointers once-for all to ONLY use the proper size helper method...since mixed-size usage at runtime seems NOT be an option given how the binding is used... ...but I can see that in this case you will need to change a bit how the scmi_shared_mem_operations are setup...since now they are a const global and initialized fully at driver init in scmi_trans_core_ops.shmem = scmi_shared_mem_operations_get(); ..so, in case you want to setup only once the properly sized helpers at run-time, all of this should happen instead at probe-time and you should have a per-probe-instance scmni_trans_core_ops struct since you could have multiple SCMI nodes using multiple shmem transports with different size... (in theory...) > u32 (*read_header)(struct scmi_shared_mem __iomem *shmem); > > void (*fetch_response)(struct scmi_shared_mem __iomem *shmem, > - struct scmi_xfer *xfer); > + struct scmi_xfer *xfer, > + u32 shmem_io_width); > void (*fetch_notification)(struct scmi_shared_mem __iomem *shmem, > - size_t max_len, struct scmi_xfer *xfer); > + size_t max_len, struct scmi_xfer *xfer, > + u32 shmem_io_width); > void (*clear_channel)(struct scmi_shared_mem __iomem *shmem); > bool (*poll_done)(struct scmi_shared_mem __iomem *shmem, > struct scmi_xfer *xfer); > @@ -350,7 +355,8 @@ struct scmi_shared_mem_operations { > bool (*channel_intr_enabled)(struct scmi_shared_mem __iomem *shmem); > void __iomem *(*setup_iomap)(struct scmi_chan_info *cinfo, > struct device *dev, > - bool tx, struct resource *res); > + bool tx, struct resource *res, > + u32 *shmem_io_width); > }; > > const struct scmi_shared_mem_operations *scmi_shared_mem_operations_get(void); > diff --git a/drivers/firmware/arm_scmi/scmi_transport_mailbox.c b/drivers/firmware/arm_scmi/scmi_transport_mailbox.c > index dc5ca894d5eb..6bd876875655 100644 > --- a/drivers/firmware/arm_scmi/scmi_transport_mailbox.c > +++ b/drivers/firmware/arm_scmi/scmi_transport_mailbox.c > @@ -33,6 +33,7 @@ struct scmi_mailbox { > struct mbox_chan *chan_platform_receiver; > struct scmi_chan_info *cinfo; > struct scmi_shared_mem __iomem *shmem; > + u32 shmem_io_width; > }; > > #define client_to_scmi_mailbox(c) container_of(c, struct scmi_mailbox, cl) > @@ -43,7 +44,8 @@ static void tx_prepare(struct mbox_client *cl, void *m) > { > struct scmi_mailbox *smbox = client_to_scmi_mailbox(cl); > > - core->shmem->tx_prepare(smbox->shmem, m, smbox->cinfo); > + core->shmem->tx_prepare(smbox->shmem, m, smbox->cinfo, > + smbox->shmem_io_width); > } > > static void rx_callback(struct mbox_client *cl, void *m) > @@ -197,7 +199,8 @@ static int mailbox_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, > if (!smbox) > return -ENOMEM; > > - smbox->shmem = core->shmem->setup_iomap(cinfo, dev, tx, NULL); > + smbox->shmem = core->shmem->setup_iomap(cinfo, dev, tx, NULL, > + &smbox->shmem_io_width); > if (IS_ERR(smbox->shmem)) > return PTR_ERR(smbox->shmem); > > @@ -298,7 +301,7 @@ static void mailbox_fetch_response(struct scmi_chan_info *cinfo, > { > struct scmi_mailbox *smbox = cinfo->transport_info; > > - core->shmem->fetch_response(smbox->shmem, xfer); > + core->shmem->fetch_response(smbox->shmem, xfer, smbox->shmem_io_width); > } > > static void mailbox_fetch_notification(struct scmi_chan_info *cinfo, > @@ -306,7 +309,8 @@ static void mailbox_fetch_notification(struct scmi_chan_info *cinfo, > { > struct scmi_mailbox *smbox = cinfo->transport_info; > > - core->shmem->fetch_notification(smbox->shmem, max_len, xfer); > + core->shmem->fetch_notification(smbox->shmem, max_len, xfer, > + smbox->shmem_io_width); > } > > static void mailbox_clear_channel(struct scmi_chan_info *cinfo) > diff --git a/drivers/firmware/arm_scmi/scmi_transport_optee.c b/drivers/firmware/arm_scmi/scmi_transport_optee.c > index 08911f40d1ff..9f6804647b29 100644 > --- a/drivers/firmware/arm_scmi/scmi_transport_optee.c > +++ b/drivers/firmware/arm_scmi/scmi_transport_optee.c > @@ -350,7 +350,8 @@ static int setup_dynamic_shmem(struct device *dev, struct scmi_optee_channel *ch > static int setup_static_shmem(struct device *dev, struct scmi_chan_info *cinfo, > struct scmi_optee_channel *channel) > { > - channel->req.shmem = core->shmem->setup_iomap(cinfo, dev, true, NULL); > + channel->req.shmem = core->shmem->setup_iomap(cinfo, dev, true, NULL, > + NULL); > if (IS_ERR(channel->req.shmem)) > return PTR_ERR(channel->req.shmem); > > @@ -465,7 +466,7 @@ static int scmi_optee_send_message(struct scmi_chan_info *cinfo, > ret = invoke_process_msg_channel(channel, > core->msg->command_size(xfer)); > } else { > - core->shmem->tx_prepare(channel->req.shmem, xfer, cinfo); > + core->shmem->tx_prepare(channel->req.shmem, xfer, cinfo, 0); > ret = invoke_process_smt_channel(channel); > } > > @@ -484,7 +485,7 @@ static void scmi_optee_fetch_response(struct scmi_chan_info *cinfo, > core->msg->fetch_response(channel->req.msg, > channel->rx_len, xfer); > else > - core->shmem->fetch_response(channel->req.shmem, xfer); > + core->shmem->fetch_response(channel->req.shmem, xfer, 0); > } > > static void scmi_optee_mark_txdone(struct scmi_chan_info *cinfo, int ret, > diff --git a/drivers/firmware/arm_scmi/scmi_transport_smc.c b/drivers/firmware/arm_scmi/scmi_transport_smc.c > index c6c69a17a9cc..4e7b2ac1c7e8 100644 > --- a/drivers/firmware/arm_scmi/scmi_transport_smc.c > +++ b/drivers/firmware/arm_scmi/scmi_transport_smc.c > @@ -60,6 +60,7 @@ struct scmi_smc { > int irq; > struct scmi_chan_info *cinfo; > struct scmi_shared_mem __iomem *shmem; > + u32 shmem_io_width; > /* Protect access to shmem area */ > struct mutex shmem_lock; > #define INFLIGHT_NONE MSG_TOKEN_MAX > @@ -144,7 +145,8 @@ static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, > if (!scmi_info) > return -ENOMEM; > > - scmi_info->shmem = core->shmem->setup_iomap(cinfo, dev, tx, &res); > + scmi_info->shmem = core->shmem->setup_iomap(cinfo, dev, tx, &res, > + &scmi_info->shmem_io_width); > if (IS_ERR(scmi_info->shmem)) > return PTR_ERR(scmi_info->shmem); > > @@ -229,7 +231,8 @@ static int smc_send_message(struct scmi_chan_info *cinfo, > */ > smc_channel_lock_acquire(scmi_info, xfer); > > - core->shmem->tx_prepare(scmi_info->shmem, xfer, cinfo); > + core->shmem->tx_prepare(scmi_info->shmem, xfer, cinfo, > + scmi_info->shmem_io_width); > > if (scmi_info->cap_id != ULONG_MAX) > arm_smccc_1_1_invoke(scmi_info->func_id, scmi_info->cap_id, 0, > @@ -253,7 +256,8 @@ static void smc_fetch_response(struct scmi_chan_info *cinfo, > { > struct scmi_smc *scmi_info = cinfo->transport_info; > > - core->shmem->fetch_response(scmi_info->shmem, xfer); > + core->shmem->fetch_response(scmi_info->shmem, xfer, > + scmi_info->shmem_io_width); > } > > static void smc_mark_txdone(struct scmi_chan_info *cinfo, int ret, > diff --git a/drivers/firmware/arm_scmi/shmem.c b/drivers/firmware/arm_scmi/shmem.c > index 01d8a9398fe8..192262d63baa 100644 > --- a/drivers/firmware/arm_scmi/shmem.c > +++ b/drivers/firmware/arm_scmi/shmem.c > @@ -34,9 +34,20 @@ struct scmi_shared_mem { > u8 msg_payload[]; > }; > > +#define __shmem_copy_toio_tpl(s) \ > + for (unsigned int i = 0; i < xfer->tx.len; i += shmem_io_width) \ > + iowrite##s(((u##s *)(xfer->tx.buf))[i / shmem_io_width], \ > + shmem->msg_payload + i); > + > +#define __shmem_copy_fromio_tpl(s) \ > + for (unsigned int i = 0; i < xfer->rx.len; i += shmem_io_width) \ > + ((u##s *)(xfer->rx.buf))[i / shmem_io_width] = \ > + ioread##s(shmem->msg_payload + shmem_io_width + i); > + > static void shmem_tx_prepare(struct scmi_shared_mem __iomem *shmem, > struct scmi_xfer *xfer, > - struct scmi_chan_info *cinfo) > + struct scmi_chan_info *cinfo, > + u32 shmem_io_width) > { > ktime_t stop; > > @@ -72,8 +83,25 @@ static void shmem_tx_prepare(struct scmi_shared_mem __iomem *shmem, > &shmem->flags); > iowrite32(sizeof(shmem->msg_header) + xfer->tx.len, &shmem->length); > iowrite32(pack_scmi_header(&xfer->hdr), &shmem->msg_header); what about these (and other) header reads if reg-io-width is defined as < 32 ? Should not these accesses be size-wise too ? or I am missing smth ... (...and if yes I would once more say that all of this should be setup once for all at setup time and not checked against a parameter at run time for each access...) > - if (xfer->tx.buf) > - memcpy_toio(shmem->msg_payload, xfer->tx.buf, xfer->tx.len); > + if (xfer->tx.buf) { > + switch (shmem_io_width) { > + case 1: > + __shmem_copy_toio_tpl(8); > + break; > + case 2: > + __shmem_copy_toio_tpl(16); > + break; > + case 4: > + __shmem_copy_toio_tpl(32); > + break; > + case 8: > + __shmem_copy_toio_tpl(64); > + break; > + default: > + memcpy_toio(shmem->msg_payload, xfer->tx.buf, xfer->tx.len); > + break; ...as said above, this switch could be avoided by setting up the transport access size once for all at setup time with properly sized-helpers... > + } > + } > } > > static u32 shmem_read_header(struct scmi_shared_mem __iomem *shmem) > @@ -81,8 +109,34 @@ static u32 shmem_read_header(struct scmi_shared_mem __iomem *shmem) > return ioread32(&shmem->msg_header); > } > > +static void __shmem_fetch_resp_notif_data(struct scmi_xfer *xfer, > + struct scmi_shared_mem __iomem *shmem, > + u32 shmem_io_width) > +{ > + /* Take a copy to the rx buffer.. */ > + switch (shmem_io_width) { > + case 1: > + __shmem_copy_fromio_tpl(8); > + break; > + case 2: > + __shmem_copy_fromio_tpl(16); > + break; > + case 4: > + __shmem_copy_fromio_tpl(32); > + break; > + case 8: > + __shmem_copy_fromio_tpl(32); > + break; > + default: > + memcpy_fromio(xfer->rx.buf, shmem->msg_payload + 4, > + xfer->rx.len); > + break; > + } > +} > + > static void shmem_fetch_response(struct scmi_shared_mem __iomem *shmem, > - struct scmi_xfer *xfer) > + struct scmi_xfer *xfer, > + u32 shmem_io_width) > { > size_t len = ioread32(&shmem->length); > > @@ -90,20 +144,19 @@ static void shmem_fetch_response(struct scmi_shared_mem __iomem *shmem, > /* Skip the length of header and status in shmem area i.e 8 bytes */ > xfer->rx.len = min_t(size_t, xfer->rx.len, len > 8 ? len - 8 : 0); > > - /* Take a copy to the rx buffer.. */ > - memcpy_fromio(xfer->rx.buf, shmem->msg_payload + 4, xfer->rx.len); > + __shmem_fetch_resp_notif_data(xfer, shmem, shmem_io_width); > } > > static void shmem_fetch_notification(struct scmi_shared_mem __iomem *shmem, > - size_t max_len, struct scmi_xfer *xfer) > + size_t max_len, struct scmi_xfer *xfer, > + u32 shmem_io_width) > { > size_t len = ioread32(&shmem->length); > > /* Skip only the length of header in shmem area i.e 4 bytes */ > xfer->rx.len = min_t(size_t, max_len, len > 4 ? len - 4 : 0); > > - /* Take a copy to the rx buffer.. */ > - memcpy_fromio(xfer->rx.buf, shmem->msg_payload, xfer->rx.len); > + __shmem_fetch_resp_notif_data(xfer, shmem, shmem_io_width); > } > > static void shmem_clear_channel(struct scmi_shared_mem __iomem *shmem) > @@ -139,7 +192,8 @@ static bool shmem_channel_intr_enabled(struct scmi_shared_mem __iomem *shmem) > > static void __iomem *shmem_setup_iomap(struct scmi_chan_info *cinfo, > struct device *dev, bool tx, > - struct resource *res) > + struct resource *res, > + u32 *shmem_io_width) > { > struct device_node *shmem __free(device_node); > const char *desc = tx ? "Tx" : "Rx"; > @@ -173,6 +227,9 @@ static void __iomem *shmem_setup_iomap(struct scmi_chan_info *cinfo, > return IOMEM_ERR_PTR(-EADDRNOTAVAIL); > } > > + if (shmem_io_width) > + of_property_read_u32(shmem, "reg-io-width", shmem_io_width); > + ...this and all the subsequent setup could be moved inside a modified shared_mem_operations_get(dev) while moving its callsite from driver_init into driver_probe (probably) insside @scmi_transport_setup....but it will require a non-trivial amount of changes in the transport to avoid the global core-> ptr. Thanks, Cristian
On 8/12/24 10:18, Cristian Marussi wrote: > On Sat, Aug 10, 2024 at 02:46:21PM -0700, Florian Fainelli wrote: >> Some shared memory areas might only support a certain access width, >> (e.g.: 32 bits accesses only). Update the shmem layer to support >> reading from and writing to such shared memory area using the specified >> I/O width in the Device Tree. The various transport layers making use of >> the shmem.c code are updated accordingly to pass the I/O width to the >> routines that need it. > > Hi Florian, > > I only glanced quicky through the series...a few remarks below. > >> >> Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> >> --- >> drivers/firmware/arm_scmi/common.h | 14 +++- >> .../arm_scmi/scmi_transport_mailbox.c | 12 ++- >> .../firmware/arm_scmi/scmi_transport_optee.c | 7 +- >> .../firmware/arm_scmi/scmi_transport_smc.c | 10 ++- >> drivers/firmware/arm_scmi/shmem.c | 77 ++++++++++++++++--- >> 5 files changed, 96 insertions(+), 24 deletions(-) >> >> diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h >> index 69928bbd01c2..97dae844a190 100644 >> --- a/drivers/firmware/arm_scmi/common.h >> +++ b/drivers/firmware/arm_scmi/common.h >> @@ -170,6 +170,7 @@ void scmi_protocol_release(const struct scmi_handle *handle, u8 protocol_id); >> * This can be dynamically set by transports at run-time >> * inside their provided .chan_setup(). >> * @transport_info: Transport layer related information >> + * @shmem_io_width: I/O width in bytes of the shared memory area >> */ >> struct scmi_chan_info { >> int id; >> @@ -178,6 +179,7 @@ struct scmi_chan_info { >> struct scmi_handle *handle; >> bool no_completion_irq; >> void *transport_info; >> + u32 shmem_io_width; >> }; > > As you said you dont need this if you embed it inside the > transpor_info...but... >> >> /** >> @@ -336,13 +338,16 @@ struct scmi_shared_mem; >> struct scmi_shared_mem_operations { >> void (*tx_prepare)(struct scmi_shared_mem __iomem *shmem, >> struct scmi_xfer *xfer, >> - struct scmi_chan_info *cinfo); >> + struct scmi_chan_info *cinfo, >> + u32 shmem_io_width); > > ...maybe also you dont need this additional parameters if you setup > upfront the shmem ops to operate ONLY on the configured size... > > ...I mean all of this seems to be a one-shot setup procedure so it > would be sensible to just configuire the shmem ops pointers once-for all > to ONLY use the proper size helper method...since mixed-size usage at > runtime seems NOT be an option given how the binding is used... > > ...but I can see that in this case you will need to change a bit > how the scmi_shared_mem_operations are setup...since now they are a > const global and initialized fully at driver init in > > scmi_trans_core_ops.shmem = scmi_shared_mem_operations_get(); > > ..so, in case you want to setup only once the properly sized helpers at > run-time, all of this should happen instead at probe-time and you should > have a per-probe-instance scmni_trans_core_ops struct since you could have > multiple SCMI nodes using multiple shmem transports with different size... > (in theory...) Indeed, let me ponder about that for a s > >> u32 (*read_header)(struct scmi_shared_mem __iomem *shmem); >> >> void (*fetch_response)(struct scmi_shared_mem __iomem *shmem, >> - struct scmi_xfer *xfer); >> + struct scmi_xfer *xfer, >> + u32 shmem_io_width); >> void (*fetch_notification)(struct scmi_shared_mem __iomem *shmem, >> - size_t max_len, struct scmi_xfer *xfer); >> + size_t max_len, struct scmi_xfer *xfer, >> + u32 shmem_io_width); >> void (*clear_channel)(struct scmi_shared_mem __iomem *shmem); >> bool (*poll_done)(struct scmi_shared_mem __iomem *shmem, >> struct scmi_xfer *xfer); >> @@ -350,7 +355,8 @@ struct scmi_shared_mem_operations { >> bool (*channel_intr_enabled)(struct scmi_shared_mem __iomem *shmem); >> void __iomem *(*setup_iomap)(struct scmi_chan_info *cinfo, >> struct device *dev, >> - bool tx, struct resource *res); >> + bool tx, struct resource *res, >> + u32 *shmem_io_width); >> }; >> >> const struct scmi_shared_mem_operations *scmi_shared_mem_operations_get(void); >> diff --git a/drivers/firmware/arm_scmi/scmi_transport_mailbox.c b/drivers/firmware/arm_scmi/scmi_transport_mailbox.c >> index dc5ca894d5eb..6bd876875655 100644 >> --- a/drivers/firmware/arm_scmi/scmi_transport_mailbox.c >> +++ b/drivers/firmware/arm_scmi/scmi_transport_mailbox.c >> @@ -33,6 +33,7 @@ struct scmi_mailbox { >> struct mbox_chan *chan_platform_receiver; >> struct scmi_chan_info *cinfo; >> struct scmi_shared_mem __iomem *shmem; >> + u32 shmem_io_width; >> }; >> >> #define client_to_scmi_mailbox(c) container_of(c, struct scmi_mailbox, cl) >> @@ -43,7 +44,8 @@ static void tx_prepare(struct mbox_client *cl, void *m) >> { >> struct scmi_mailbox *smbox = client_to_scmi_mailbox(cl); >> >> - core->shmem->tx_prepare(smbox->shmem, m, smbox->cinfo); >> + core->shmem->tx_prepare(smbox->shmem, m, smbox->cinfo, >> + smbox->shmem_io_width); >> } >> >> static void rx_callback(struct mbox_client *cl, void *m) >> @@ -197,7 +199,8 @@ static int mailbox_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, >> if (!smbox) >> return -ENOMEM; >> >> - smbox->shmem = core->shmem->setup_iomap(cinfo, dev, tx, NULL); >> + smbox->shmem = core->shmem->setup_iomap(cinfo, dev, tx, NULL, >> + &smbox->shmem_io_width); >> if (IS_ERR(smbox->shmem)) >> return PTR_ERR(smbox->shmem); >> >> @@ -298,7 +301,7 @@ static void mailbox_fetch_response(struct scmi_chan_info *cinfo, >> { >> struct scmi_mailbox *smbox = cinfo->transport_info; >> >> - core->shmem->fetch_response(smbox->shmem, xfer); >> + core->shmem->fetch_response(smbox->shmem, xfer, smbox->shmem_io_width); >> } >> >> static void mailbox_fetch_notification(struct scmi_chan_info *cinfo, >> @@ -306,7 +309,8 @@ static void mailbox_fetch_notification(struct scmi_chan_info *cinfo, >> { >> struct scmi_mailbox *smbox = cinfo->transport_info; >> >> - core->shmem->fetch_notification(smbox->shmem, max_len, xfer); >> + core->shmem->fetch_notification(smbox->shmem, max_len, xfer, >> + smbox->shmem_io_width); >> } >> >> static void mailbox_clear_channel(struct scmi_chan_info *cinfo) >> diff --git a/drivers/firmware/arm_scmi/scmi_transport_optee.c b/drivers/firmware/arm_scmi/scmi_transport_optee.c >> index 08911f40d1ff..9f6804647b29 100644 >> --- a/drivers/firmware/arm_scmi/scmi_transport_optee.c >> +++ b/drivers/firmware/arm_scmi/scmi_transport_optee.c >> @@ -350,7 +350,8 @@ static int setup_dynamic_shmem(struct device *dev, struct scmi_optee_channel *ch >> static int setup_static_shmem(struct device *dev, struct scmi_chan_info *cinfo, >> struct scmi_optee_channel *channel) >> { >> - channel->req.shmem = core->shmem->setup_iomap(cinfo, dev, true, NULL); >> + channel->req.shmem = core->shmem->setup_iomap(cinfo, dev, true, NULL, >> + NULL); >> if (IS_ERR(channel->req.shmem)) >> return PTR_ERR(channel->req.shmem); >> >> @@ -465,7 +466,7 @@ static int scmi_optee_send_message(struct scmi_chan_info *cinfo, >> ret = invoke_process_msg_channel(channel, >> core->msg->command_size(xfer)); >> } else { >> - core->shmem->tx_prepare(channel->req.shmem, xfer, cinfo); >> + core->shmem->tx_prepare(channel->req.shmem, xfer, cinfo, 0); >> ret = invoke_process_smt_channel(channel); >> } >> >> @@ -484,7 +485,7 @@ static void scmi_optee_fetch_response(struct scmi_chan_info *cinfo, >> core->msg->fetch_response(channel->req.msg, >> channel->rx_len, xfer); >> else >> - core->shmem->fetch_response(channel->req.shmem, xfer); >> + core->shmem->fetch_response(channel->req.shmem, xfer, 0); >> } >> >> static void scmi_optee_mark_txdone(struct scmi_chan_info *cinfo, int ret, >> diff --git a/drivers/firmware/arm_scmi/scmi_transport_smc.c b/drivers/firmware/arm_scmi/scmi_transport_smc.c >> index c6c69a17a9cc..4e7b2ac1c7e8 100644 >> --- a/drivers/firmware/arm_scmi/scmi_transport_smc.c >> +++ b/drivers/firmware/arm_scmi/scmi_transport_smc.c >> @@ -60,6 +60,7 @@ struct scmi_smc { >> int irq; >> struct scmi_chan_info *cinfo; >> struct scmi_shared_mem __iomem *shmem; >> + u32 shmem_io_width; >> /* Protect access to shmem area */ >> struct mutex shmem_lock; >> #define INFLIGHT_NONE MSG_TOKEN_MAX >> @@ -144,7 +145,8 @@ static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, >> if (!scmi_info) >> return -ENOMEM; >> >> - scmi_info->shmem = core->shmem->setup_iomap(cinfo, dev, tx, &res); >> + scmi_info->shmem = core->shmem->setup_iomap(cinfo, dev, tx, &res, >> + &scmi_info->shmem_io_width); >> if (IS_ERR(scmi_info->shmem)) >> return PTR_ERR(scmi_info->shmem); >> >> @@ -229,7 +231,8 @@ static int smc_send_message(struct scmi_chan_info *cinfo, >> */ >> smc_channel_lock_acquire(scmi_info, xfer); >> >> - core->shmem->tx_prepare(scmi_info->shmem, xfer, cinfo); >> + core->shmem->tx_prepare(scmi_info->shmem, xfer, cinfo, >> + scmi_info->shmem_io_width); >> >> if (scmi_info->cap_id != ULONG_MAX) >> arm_smccc_1_1_invoke(scmi_info->func_id, scmi_info->cap_id, 0, >> @@ -253,7 +256,8 @@ static void smc_fetch_response(struct scmi_chan_info *cinfo, >> { >> struct scmi_smc *scmi_info = cinfo->transport_info; >> >> - core->shmem->fetch_response(scmi_info->shmem, xfer); >> + core->shmem->fetch_response(scmi_info->shmem, xfer, >> + scmi_info->shmem_io_width); >> } >> >> static void smc_mark_txdone(struct scmi_chan_info *cinfo, int ret, >> diff --git a/drivers/firmware/arm_scmi/shmem.c b/drivers/firmware/arm_scmi/shmem.c >> index 01d8a9398fe8..192262d63baa 100644 >> --- a/drivers/firmware/arm_scmi/shmem.c >> +++ b/drivers/firmware/arm_scmi/shmem.c >> @@ -34,9 +34,20 @@ struct scmi_shared_mem { >> u8 msg_payload[]; >> }; >> >> +#define __shmem_copy_toio_tpl(s) \ >> + for (unsigned int i = 0; i < xfer->tx.len; i += shmem_io_width) \ >> + iowrite##s(((u##s *)(xfer->tx.buf))[i / shmem_io_width], \ >> + shmem->msg_payload + i); >> + >> +#define __shmem_copy_fromio_tpl(s) \ >> + for (unsigned int i = 0; i < xfer->rx.len; i += shmem_io_width) \ >> + ((u##s *)(xfer->rx.buf))[i / shmem_io_width] = \ >> + ioread##s(shmem->msg_payload + shmem_io_width + i); >> + >> static void shmem_tx_prepare(struct scmi_shared_mem __iomem *shmem, >> struct scmi_xfer *xfer, >> - struct scmi_chan_info *cinfo) >> + struct scmi_chan_info *cinfo, >> + u32 shmem_io_width) >> { >> ktime_t stop; >> >> @@ -72,8 +83,25 @@ static void shmem_tx_prepare(struct scmi_shared_mem __iomem *shmem, >> &shmem->flags); >> iowrite32(sizeof(shmem->msg_header) + xfer->tx.len, &shmem->length); >> iowrite32(pack_scmi_header(&xfer->hdr), &shmem->msg_header); > > what about these (and other) header reads if reg-io-width is defined as < 32 ? > Should not these accesses be size-wise too ? or I am missing smth ... Good question, I suppose it depends whether 'reg-io-width' means that this must be the strict access width we use, or if this is the minimum access width supported. If the former, then yes, we do have to make a whole lot of changes to support the only access width being supported, if the latter, then we ought to be OK, because doing a 32-bit access should drive more byte enables at the bus level, yet still return the expected data. A minimum or only supported access width of 64-bit would be quite interesting, and not somewhat compatible with how SCMI is defined, so maybe that one should not be supported at all, even if this is how memcpy_{to,from}_io() decides to operate on parts of the memory that are 8bytes aligned. > (...and if yes I would once more say that all of this should be setup once for > all at setup time and not checked against a parameter at run time for each access...) > >> - if (xfer->tx.buf) >> - memcpy_toio(shmem->msg_payload, xfer->tx.buf, xfer->tx.len); >> + if (xfer->tx.buf) { >> + switch (shmem_io_width) { >> + case 1: >> + __shmem_copy_toio_tpl(8); >> + break; >> + case 2: >> + __shmem_copy_toio_tpl(16); >> + break; >> + case 4: >> + __shmem_copy_toio_tpl(32); >> + break; >> + case 8: >> + __shmem_copy_toio_tpl(64); >> + break; >> + default: >> + memcpy_toio(shmem->msg_payload, xfer->tx.buf, xfer->tx.len); >> + break; > > ...as said above, this switch could be avoided by setting up the > transport access size once for all at setup time with properly > sized-helpers... > > >> + } >> + } >> } >> >> static u32 shmem_read_header(struct scmi_shared_mem __iomem *shmem) >> @@ -81,8 +109,34 @@ static u32 shmem_read_header(struct scmi_shared_mem __iomem *shmem) >> return ioread32(&shmem->msg_header); >> } >> >> +static void __shmem_fetch_resp_notif_data(struct scmi_xfer *xfer, >> + struct scmi_shared_mem __iomem *shmem, >> + u32 shmem_io_width) >> +{ >> + /* Take a copy to the rx buffer.. */ >> + switch (shmem_io_width) { >> + case 1: >> + __shmem_copy_fromio_tpl(8); >> + break; >> + case 2: >> + __shmem_copy_fromio_tpl(16); >> + break; >> + case 4: >> + __shmem_copy_fromio_tpl(32); >> + break; >> + case 8: >> + __shmem_copy_fromio_tpl(32); >> + break; >> + default: >> + memcpy_fromio(xfer->rx.buf, shmem->msg_payload + 4, >> + xfer->rx.len); >> + break; >> + } >> +} >> + >> static void shmem_fetch_response(struct scmi_shared_mem __iomem *shmem, >> - struct scmi_xfer *xfer) >> + struct scmi_xfer *xfer, >> + u32 shmem_io_width) >> { >> size_t len = ioread32(&shmem->length); >> >> @@ -90,20 +144,19 @@ static void shmem_fetch_response(struct scmi_shared_mem __iomem *shmem, >> /* Skip the length of header and status in shmem area i.e 8 bytes */ >> xfer->rx.len = min_t(size_t, xfer->rx.len, len > 8 ? len - 8 : 0); >> >> - /* Take a copy to the rx buffer.. */ >> - memcpy_fromio(xfer->rx.buf, shmem->msg_payload + 4, xfer->rx.len); >> + __shmem_fetch_resp_notif_data(xfer, shmem, shmem_io_width); >> } >> >> static void shmem_fetch_notification(struct scmi_shared_mem __iomem *shmem, >> - size_t max_len, struct scmi_xfer *xfer) >> + size_t max_len, struct scmi_xfer *xfer, >> + u32 shmem_io_width) >> { >> size_t len = ioread32(&shmem->length); >> >> /* Skip only the length of header in shmem area i.e 4 bytes */ >> xfer->rx.len = min_t(size_t, max_len, len > 4 ? len - 4 : 0); >> >> - /* Take a copy to the rx buffer.. */ >> - memcpy_fromio(xfer->rx.buf, shmem->msg_payload, xfer->rx.len); >> + __shmem_fetch_resp_notif_data(xfer, shmem, shmem_io_width); >> } >> >> static void shmem_clear_channel(struct scmi_shared_mem __iomem *shmem) >> @@ -139,7 +192,8 @@ static bool shmem_channel_intr_enabled(struct scmi_shared_mem __iomem *shmem) >> >> static void __iomem *shmem_setup_iomap(struct scmi_chan_info *cinfo, >> struct device *dev, bool tx, >> - struct resource *res) >> + struct resource *res, >> + u32 *shmem_io_width) >> { >> struct device_node *shmem __free(device_node); >> const char *desc = tx ? "Tx" : "Rx"; >> @@ -173,6 +227,9 @@ static void __iomem *shmem_setup_iomap(struct scmi_chan_info *cinfo, >> return IOMEM_ERR_PTR(-EADDRNOTAVAIL); >> } >> >> + if (shmem_io_width) >> + of_property_read_u32(shmem, "reg-io-width", shmem_io_width); >> + > > > ...this and all the subsequent setup could be moved inside a modified > shared_mem_operations_get(dev) while moving its callsite from driver_init into > driver_probe (probably) insside @scmi_transport_setup....but it will require > a non-trivial amount of changes in the transport to avoid the global core-> ptr. OK, I will think about more about what needs to be done here, but in general, do you agree this is an acceptable approach to support "odd" SRAMs?
On Mon, Aug 12, 2024 at 10:46:31AM -0700, Florian Fainelli wrote: > On 8/12/24 10:18, Cristian Marussi wrote: > > On Sat, Aug 10, 2024 at 02:46:21PM -0700, Florian Fainelli wrote: > > > Some shared memory areas might only support a certain access width, > > > (e.g.: 32 bits accesses only). Update the shmem layer to support > > > reading from and writing to such shared memory area using the specified > > > I/O width in the Device Tree. The various transport layers making use of > > > the shmem.c code are updated accordingly to pass the I/O width to the > > > routines that need it. > > > > Hi Florian, > > > > I only glanced quicky through the series...a few remarks below. > > > > > > > > Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> > > > --- > > > drivers/firmware/arm_scmi/common.h | 14 +++- > > > .../arm_scmi/scmi_transport_mailbox.c | 12 ++- > > > .../firmware/arm_scmi/scmi_transport_optee.c | 7 +- > > > .../firmware/arm_scmi/scmi_transport_smc.c | 10 ++- > > > drivers/firmware/arm_scmi/shmem.c | 77 ++++++++++++++++--- > > > 5 files changed, 96 insertions(+), 24 deletions(-) > > > > > > diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h > > > index 69928bbd01c2..97dae844a190 100644 > > > --- a/drivers/firmware/arm_scmi/common.h > > > +++ b/drivers/firmware/arm_scmi/common.h > > > @@ -170,6 +170,7 @@ void scmi_protocol_release(const struct scmi_handle *handle, u8 protocol_id); > > > * This can be dynamically set by transports at run-time > > > * inside their provided .chan_setup(). > > > * @transport_info: Transport layer related information > > > + * @shmem_io_width: I/O width in bytes of the shared memory area > > > */ > > > struct scmi_chan_info { > > > int id; > > > @@ -178,6 +179,7 @@ struct scmi_chan_info { > > > struct scmi_handle *handle; > > > bool no_completion_irq; > > > void *transport_info; > > > + u32 shmem_io_width; > > > }; > > > > As you said you dont need this if you embed it inside the > > transpor_info...but... > > > /** > > > @@ -336,13 +338,16 @@ struct scmi_shared_mem; > > > struct scmi_shared_mem_operations { > > > void (*tx_prepare)(struct scmi_shared_mem __iomem *shmem, > > > struct scmi_xfer *xfer, > > > - struct scmi_chan_info *cinfo); > > > + struct scmi_chan_info *cinfo, > > > + u32 shmem_io_width); > > > > ...maybe also you dont need this additional parameters if you setup > > upfront the shmem ops to operate ONLY on the configured size... > > > > ...I mean all of this seems to be a one-shot setup procedure so it > > would be sensible to just configuire the shmem ops pointers once-for all > > to ONLY use the proper size helper method...since mixed-size usage at > > runtime seems NOT be an option given how the binding is used... > > > > ...but I can see that in this case you will need to change a bit > > how the scmi_shared_mem_operations are setup...since now they are a > > const global and initialized fully at driver init in > > > > scmi_trans_core_ops.shmem = scmi_shared_mem_operations_get(); > > > > ..so, in case you want to setup only once the properly sized helpers at > > run-time, all of this should happen instead at probe-time and you should > > have a per-probe-instance scmni_trans_core_ops struct since you could have > > multiple SCMI nodes using multiple shmem transports with different size... > > (in theory...) > > Indeed, let me ponder about that for a s > > > > > > u32 (*read_header)(struct scmi_shared_mem __iomem *shmem); > > > void (*fetch_response)(struct scmi_shared_mem __iomem *shmem, > > > - struct scmi_xfer *xfer); > > > + struct scmi_xfer *xfer, > > > + u32 shmem_io_width); > > > void (*fetch_notification)(struct scmi_shared_mem __iomem *shmem, > > > - size_t max_len, struct scmi_xfer *xfer); > > > + size_t max_len, struct scmi_xfer *xfer, > > > + u32 shmem_io_width); > > > void (*clear_channel)(struct scmi_shared_mem __iomem *shmem); > > > bool (*poll_done)(struct scmi_shared_mem __iomem *shmem, > > > struct scmi_xfer *xfer); > > > @@ -350,7 +355,8 @@ struct scmi_shared_mem_operations { > > > bool (*channel_intr_enabled)(struct scmi_shared_mem __iomem *shmem); > > > void __iomem *(*setup_iomap)(struct scmi_chan_info *cinfo, > > > struct device *dev, > > > - bool tx, struct resource *res); > > > + bool tx, struct resource *res, > > > + u32 *shmem_io_width); > > > }; > > > const struct scmi_shared_mem_operations *scmi_shared_mem_operations_get(void); > > > diff --git a/drivers/firmware/arm_scmi/scmi_transport_mailbox.c b/drivers/firmware/arm_scmi/scmi_transport_mailbox.c > > > index dc5ca894d5eb..6bd876875655 100644 > > > --- a/drivers/firmware/arm_scmi/scmi_transport_mailbox.c > > > +++ b/drivers/firmware/arm_scmi/scmi_transport_mailbox.c > > > @@ -33,6 +33,7 @@ struct scmi_mailbox { > > > struct mbox_chan *chan_platform_receiver; > > > struct scmi_chan_info *cinfo; > > > struct scmi_shared_mem __iomem *shmem; > > > + u32 shmem_io_width; > > > }; > > > #define client_to_scmi_mailbox(c) container_of(c, struct scmi_mailbox, cl) > > > @@ -43,7 +44,8 @@ static void tx_prepare(struct mbox_client *cl, void *m) > > > { > > > struct scmi_mailbox *smbox = client_to_scmi_mailbox(cl); > > > - core->shmem->tx_prepare(smbox->shmem, m, smbox->cinfo); > > > + core->shmem->tx_prepare(smbox->shmem, m, smbox->cinfo, > > > + smbox->shmem_io_width); > > > } > > > static void rx_callback(struct mbox_client *cl, void *m) > > > @@ -197,7 +199,8 @@ static int mailbox_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, > > > if (!smbox) > > > return -ENOMEM; > > > - smbox->shmem = core->shmem->setup_iomap(cinfo, dev, tx, NULL); > > > + smbox->shmem = core->shmem->setup_iomap(cinfo, dev, tx, NULL, > > > + &smbox->shmem_io_width); > > > if (IS_ERR(smbox->shmem)) > > > return PTR_ERR(smbox->shmem); > > > @@ -298,7 +301,7 @@ static void mailbox_fetch_response(struct scmi_chan_info *cinfo, > > > { > > > struct scmi_mailbox *smbox = cinfo->transport_info; > > > - core->shmem->fetch_response(smbox->shmem, xfer); > > > + core->shmem->fetch_response(smbox->shmem, xfer, smbox->shmem_io_width); > > > } > > > static void mailbox_fetch_notification(struct scmi_chan_info *cinfo, > > > @@ -306,7 +309,8 @@ static void mailbox_fetch_notification(struct scmi_chan_info *cinfo, > > > { > > > struct scmi_mailbox *smbox = cinfo->transport_info; > > > - core->shmem->fetch_notification(smbox->shmem, max_len, xfer); > > > + core->shmem->fetch_notification(smbox->shmem, max_len, xfer, > > > + smbox->shmem_io_width); > > > } > > > static void mailbox_clear_channel(struct scmi_chan_info *cinfo) > > > diff --git a/drivers/firmware/arm_scmi/scmi_transport_optee.c b/drivers/firmware/arm_scmi/scmi_transport_optee.c > > > index 08911f40d1ff..9f6804647b29 100644 > > > --- a/drivers/firmware/arm_scmi/scmi_transport_optee.c > > > +++ b/drivers/firmware/arm_scmi/scmi_transport_optee.c > > > @@ -350,7 +350,8 @@ static int setup_dynamic_shmem(struct device *dev, struct scmi_optee_channel *ch > > > static int setup_static_shmem(struct device *dev, struct scmi_chan_info *cinfo, > > > struct scmi_optee_channel *channel) > > > { > > > - channel->req.shmem = core->shmem->setup_iomap(cinfo, dev, true, NULL); > > > + channel->req.shmem = core->shmem->setup_iomap(cinfo, dev, true, NULL, > > > + NULL); > > > if (IS_ERR(channel->req.shmem)) > > > return PTR_ERR(channel->req.shmem); > > > @@ -465,7 +466,7 @@ static int scmi_optee_send_message(struct scmi_chan_info *cinfo, > > > ret = invoke_process_msg_channel(channel, > > > core->msg->command_size(xfer)); > > > } else { > > > - core->shmem->tx_prepare(channel->req.shmem, xfer, cinfo); > > > + core->shmem->tx_prepare(channel->req.shmem, xfer, cinfo, 0); > > > ret = invoke_process_smt_channel(channel); > > > } > > > @@ -484,7 +485,7 @@ static void scmi_optee_fetch_response(struct scmi_chan_info *cinfo, > > > core->msg->fetch_response(channel->req.msg, > > > channel->rx_len, xfer); > > > else > > > - core->shmem->fetch_response(channel->req.shmem, xfer); > > > + core->shmem->fetch_response(channel->req.shmem, xfer, 0); > > > } > > > static void scmi_optee_mark_txdone(struct scmi_chan_info *cinfo, int ret, > > > diff --git a/drivers/firmware/arm_scmi/scmi_transport_smc.c b/drivers/firmware/arm_scmi/scmi_transport_smc.c > > > index c6c69a17a9cc..4e7b2ac1c7e8 100644 > > > --- a/drivers/firmware/arm_scmi/scmi_transport_smc.c > > > +++ b/drivers/firmware/arm_scmi/scmi_transport_smc.c > > > @@ -60,6 +60,7 @@ struct scmi_smc { > > > int irq; > > > struct scmi_chan_info *cinfo; > > > struct scmi_shared_mem __iomem *shmem; > > > + u32 shmem_io_width; > > > /* Protect access to shmem area */ > > > struct mutex shmem_lock; > > > #define INFLIGHT_NONE MSG_TOKEN_MAX > > > @@ -144,7 +145,8 @@ static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, > > > if (!scmi_info) > > > return -ENOMEM; > > > - scmi_info->shmem = core->shmem->setup_iomap(cinfo, dev, tx, &res); > > > + scmi_info->shmem = core->shmem->setup_iomap(cinfo, dev, tx, &res, > > > + &scmi_info->shmem_io_width); > > > if (IS_ERR(scmi_info->shmem)) > > > return PTR_ERR(scmi_info->shmem); > > > @@ -229,7 +231,8 @@ static int smc_send_message(struct scmi_chan_info *cinfo, > > > */ > > > smc_channel_lock_acquire(scmi_info, xfer); > > > - core->shmem->tx_prepare(scmi_info->shmem, xfer, cinfo); > > > + core->shmem->tx_prepare(scmi_info->shmem, xfer, cinfo, > > > + scmi_info->shmem_io_width); > > > if (scmi_info->cap_id != ULONG_MAX) > > > arm_smccc_1_1_invoke(scmi_info->func_id, scmi_info->cap_id, 0, > > > @@ -253,7 +256,8 @@ static void smc_fetch_response(struct scmi_chan_info *cinfo, > > > { > > > struct scmi_smc *scmi_info = cinfo->transport_info; > > > - core->shmem->fetch_response(scmi_info->shmem, xfer); > > > + core->shmem->fetch_response(scmi_info->shmem, xfer, > > > + scmi_info->shmem_io_width); > > > } > > > static void smc_mark_txdone(struct scmi_chan_info *cinfo, int ret, > > > diff --git a/drivers/firmware/arm_scmi/shmem.c b/drivers/firmware/arm_scmi/shmem.c > > > index 01d8a9398fe8..192262d63baa 100644 > > > --- a/drivers/firmware/arm_scmi/shmem.c > > > +++ b/drivers/firmware/arm_scmi/shmem.c > > > @@ -34,9 +34,20 @@ struct scmi_shared_mem { > > > u8 msg_payload[]; > > > }; > > > +#define __shmem_copy_toio_tpl(s) \ > > > + for (unsigned int i = 0; i < xfer->tx.len; i += shmem_io_width) \ > > > + iowrite##s(((u##s *)(xfer->tx.buf))[i / shmem_io_width], \ > > > + shmem->msg_payload + i); > > > + > > > +#define __shmem_copy_fromio_tpl(s) \ > > > + for (unsigned int i = 0; i < xfer->rx.len; i += shmem_io_width) \ > > > + ((u##s *)(xfer->rx.buf))[i / shmem_io_width] = \ > > > + ioread##s(shmem->msg_payload + shmem_io_width + i); > > > + > > > static void shmem_tx_prepare(struct scmi_shared_mem __iomem *shmem, > > > struct scmi_xfer *xfer, > > > - struct scmi_chan_info *cinfo) > > > + struct scmi_chan_info *cinfo, > > > + u32 shmem_io_width) > > > { > > > ktime_t stop; > > > @@ -72,8 +83,25 @@ static void shmem_tx_prepare(struct scmi_shared_mem __iomem *shmem, > > > &shmem->flags); > > > iowrite32(sizeof(shmem->msg_header) + xfer->tx.len, &shmem->length); > > > iowrite32(pack_scmi_header(&xfer->hdr), &shmem->msg_header); > > > > what about these (and other) header reads if reg-io-width is defined as < 32 ? > > Should not these accesses be size-wise too ? or I am missing smth ... > > Good question, I suppose it depends whether 'reg-io-width' means that this > must be the strict access width we use, or if this is the minimum access > width supported. If the former, then yes, we do have to make a whole lot of > changes to support the only access width being supported, if the latter, > then we ought to be OK, because doing a 32-bit access should drive more byte > enables at the bus level, yet still return the expected data. > > A minimum or only supported access width of 64-bit would be quite > interesting, and not somewhat compatible with how SCMI is defined, so maybe > that one should not be supported at all, even if this is how > memcpy_{to,from}_io() decides to operate on parts of the memory that are > 8bytes aligned. > > > (...and if yes I would once more say that all of this should be setup once for > > all at setup time and not checked against a parameter at run time for each access...) > > > > > - if (xfer->tx.buf) > > > - memcpy_toio(shmem->msg_payload, xfer->tx.buf, xfer->tx.len); > > > + if (xfer->tx.buf) { > > > + switch (shmem_io_width) { > > > + case 1: > > > + __shmem_copy_toio_tpl(8); > > > + break; > > > + case 2: > > > + __shmem_copy_toio_tpl(16); > > > + break; > > > + case 4: > > > + __shmem_copy_toio_tpl(32); > > > + break; > > > + case 8: > > > + __shmem_copy_toio_tpl(64); > > > + break; > > > + default: > > > + memcpy_toio(shmem->msg_payload, xfer->tx.buf, xfer->tx.len); > > > + break; > > > > ...as said above, this switch could be avoided by setting up the > > transport access size once for all at setup time with properly > > sized-helpers... > > > > > > > + } > > > + } > > > } > > > static u32 shmem_read_header(struct scmi_shared_mem __iomem *shmem) > > > @@ -81,8 +109,34 @@ static u32 shmem_read_header(struct scmi_shared_mem __iomem *shmem) > > > return ioread32(&shmem->msg_header); > > > } > > > +static void __shmem_fetch_resp_notif_data(struct scmi_xfer *xfer, > > > + struct scmi_shared_mem __iomem *shmem, > > > + u32 shmem_io_width) > > > +{ > > > + /* Take a copy to the rx buffer.. */ > > > + switch (shmem_io_width) { > > > + case 1: > > > + __shmem_copy_fromio_tpl(8); > > > + break; > > > + case 2: > > > + __shmem_copy_fromio_tpl(16); > > > + break; > > > + case 4: > > > + __shmem_copy_fromio_tpl(32); > > > + break; > > > + case 8: > > > + __shmem_copy_fromio_tpl(32); > > > + break; > > > + default: > > > + memcpy_fromio(xfer->rx.buf, shmem->msg_payload + 4, > > > + xfer->rx.len); > > > + break; > > > + } > > > +} > > > + > > > static void shmem_fetch_response(struct scmi_shared_mem __iomem *shmem, > > > - struct scmi_xfer *xfer) > > > + struct scmi_xfer *xfer, > > > + u32 shmem_io_width) > > > { > > > size_t len = ioread32(&shmem->length); > > > @@ -90,20 +144,19 @@ static void shmem_fetch_response(struct scmi_shared_mem __iomem *shmem, > > > /* Skip the length of header and status in shmem area i.e 8 bytes */ > > > xfer->rx.len = min_t(size_t, xfer->rx.len, len > 8 ? len - 8 : 0); > > > - /* Take a copy to the rx buffer.. */ > > > - memcpy_fromio(xfer->rx.buf, shmem->msg_payload + 4, xfer->rx.len); > > > + __shmem_fetch_resp_notif_data(xfer, shmem, shmem_io_width); > > > } > > > static void shmem_fetch_notification(struct scmi_shared_mem __iomem *shmem, > > > - size_t max_len, struct scmi_xfer *xfer) > > > + size_t max_len, struct scmi_xfer *xfer, > > > + u32 shmem_io_width) > > > { > > > size_t len = ioread32(&shmem->length); > > > /* Skip only the length of header in shmem area i.e 4 bytes */ > > > xfer->rx.len = min_t(size_t, max_len, len > 4 ? len - 4 : 0); > > > - /* Take a copy to the rx buffer.. */ > > > - memcpy_fromio(xfer->rx.buf, shmem->msg_payload, xfer->rx.len); > > > + __shmem_fetch_resp_notif_data(xfer, shmem, shmem_io_width); > > > } > > > static void shmem_clear_channel(struct scmi_shared_mem __iomem *shmem) > > > @@ -139,7 +192,8 @@ static bool shmem_channel_intr_enabled(struct scmi_shared_mem __iomem *shmem) > > > static void __iomem *shmem_setup_iomap(struct scmi_chan_info *cinfo, > > > struct device *dev, bool tx, > > > - struct resource *res) > > > + struct resource *res, > > > + u32 *shmem_io_width) > > > { > > > struct device_node *shmem __free(device_node); > > > const char *desc = tx ? "Tx" : "Rx"; > > > @@ -173,6 +227,9 @@ static void __iomem *shmem_setup_iomap(struct scmi_chan_info *cinfo, > > > return IOMEM_ERR_PTR(-EADDRNOTAVAIL); > > > } > > > + if (shmem_io_width) > > > + of_property_read_u32(shmem, "reg-io-width", shmem_io_width); > > > + > > > > > > ...this and all the subsequent setup could be moved inside a modified > > shared_mem_operations_get(dev) while moving its callsite from driver_init into > > driver_probe (probably) insside @scmi_transport_setup....but it will require > > a non-trivial amount of changes in the transport to avoid the global core-> ptr. > > OK, I will think about more about what needs to be done here, but in > general, do you agree this is an acceptable approach to support "odd" SRAMs? Yes, but one question comes up in my mind upfront (maybe similar to Rob remarks): is this not, in theory, something general that should be somehow addressed transparently by the core SRAM code when dealing with such odd SRAM, since SCMI is indeed only onne of the possible users ? (not saying to do this in this series that deals with SCMI related issues....) Anyway, I'll have a though too about the SCMI core transport possible changes that I mentiond above, soon-ish... (I tried something already today, hoping to solve it quickly ...with poor results :D) Thanks, Cristian
On 8/12/24 11:01, Cristian Marussi wrote: >> OK, I will think about more about what needs to be done here, but in >> general, do you agree this is an acceptable approach to support "odd" SRAMs? > > Yes, but one question comes up in my mind upfront (maybe similar to Rob remarks): > is this not, in theory, something general that should be somehow addressed transparently > by the core SRAM code when dealing with such odd SRAM, since SCMI is > indeed only onne of the possible users ? > (not saying to do this in this series that deals with SCMI related issues....) > > Anyway, I'll have a though too about the SCMI core transport possible changes that I > mentiond above, soon-ish... (I tried something already today, hoping to solve it quickly > ...with poor results :D) What do you think about keeping the status quo with the scmi_shared_mem singleton and instead introduce a per-shmem scmi_shared_mem_io_ops which would contain function pointers to read from/write to the shared memory? This would keep the scmi_shared_mem read-only and a singleton and the transport would be responsible for storing and passing that set of function pointers around, post setup_iomap() where the determination would have been done.
On 8/12/2024 10:46 AM, Florian Fainelli wrote: [snip] >> what about these (and other) header reads if reg-io-width is defined >> as < 32 ? >> Should not these accesses be size-wise too ? or I am missing smth ... > > Good question, I suppose it depends whether 'reg-io-width' means that > this must be the strict access width we use, or if this is the minimum > access width supported. If the former, then yes, we do have to make a > whole lot of changes to support the only access width being supported, > if the latter, then we ought to be OK, because doing a 32-bit access > should drive more byte enables at the bus level, yet still return the > expected data. > > A minimum or only supported access width of 64-bit would be quite > interesting, and not somewhat compatible with how SCMI is defined, so > maybe that one should not be supported at all, even if this is how > memcpy_{to,from}_io() decides to operate on parts of the memory that are > 8bytes aligned. I am inclined to dropping support for doing 1 and 2 byte accesses, and support only 4-byte accesses, since the existing SCMI code makes use of io{read,write}32 in many places, unless you feel strongly about it. 1 and 2 byte accesses only do not quite make sense for a SRAM IMHO, that is, if you can support 1 byte, then you must support 4 byte, too.
diff --git a/drivers/firmware/arm_scmi/common.h b/drivers/firmware/arm_scmi/common.h index 69928bbd01c2..97dae844a190 100644 --- a/drivers/firmware/arm_scmi/common.h +++ b/drivers/firmware/arm_scmi/common.h @@ -170,6 +170,7 @@ void scmi_protocol_release(const struct scmi_handle *handle, u8 protocol_id); * This can be dynamically set by transports at run-time * inside their provided .chan_setup(). * @transport_info: Transport layer related information + * @shmem_io_width: I/O width in bytes of the shared memory area */ struct scmi_chan_info { int id; @@ -178,6 +179,7 @@ struct scmi_chan_info { struct scmi_handle *handle; bool no_completion_irq; void *transport_info; + u32 shmem_io_width; }; /** @@ -336,13 +338,16 @@ struct scmi_shared_mem; struct scmi_shared_mem_operations { void (*tx_prepare)(struct scmi_shared_mem __iomem *shmem, struct scmi_xfer *xfer, - struct scmi_chan_info *cinfo); + struct scmi_chan_info *cinfo, + u32 shmem_io_width); u32 (*read_header)(struct scmi_shared_mem __iomem *shmem); void (*fetch_response)(struct scmi_shared_mem __iomem *shmem, - struct scmi_xfer *xfer); + struct scmi_xfer *xfer, + u32 shmem_io_width); void (*fetch_notification)(struct scmi_shared_mem __iomem *shmem, - size_t max_len, struct scmi_xfer *xfer); + size_t max_len, struct scmi_xfer *xfer, + u32 shmem_io_width); void (*clear_channel)(struct scmi_shared_mem __iomem *shmem); bool (*poll_done)(struct scmi_shared_mem __iomem *shmem, struct scmi_xfer *xfer); @@ -350,7 +355,8 @@ struct scmi_shared_mem_operations { bool (*channel_intr_enabled)(struct scmi_shared_mem __iomem *shmem); void __iomem *(*setup_iomap)(struct scmi_chan_info *cinfo, struct device *dev, - bool tx, struct resource *res); + bool tx, struct resource *res, + u32 *shmem_io_width); }; const struct scmi_shared_mem_operations *scmi_shared_mem_operations_get(void); diff --git a/drivers/firmware/arm_scmi/scmi_transport_mailbox.c b/drivers/firmware/arm_scmi/scmi_transport_mailbox.c index dc5ca894d5eb..6bd876875655 100644 --- a/drivers/firmware/arm_scmi/scmi_transport_mailbox.c +++ b/drivers/firmware/arm_scmi/scmi_transport_mailbox.c @@ -33,6 +33,7 @@ struct scmi_mailbox { struct mbox_chan *chan_platform_receiver; struct scmi_chan_info *cinfo; struct scmi_shared_mem __iomem *shmem; + u32 shmem_io_width; }; #define client_to_scmi_mailbox(c) container_of(c, struct scmi_mailbox, cl) @@ -43,7 +44,8 @@ static void tx_prepare(struct mbox_client *cl, void *m) { struct scmi_mailbox *smbox = client_to_scmi_mailbox(cl); - core->shmem->tx_prepare(smbox->shmem, m, smbox->cinfo); + core->shmem->tx_prepare(smbox->shmem, m, smbox->cinfo, + smbox->shmem_io_width); } static void rx_callback(struct mbox_client *cl, void *m) @@ -197,7 +199,8 @@ static int mailbox_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, if (!smbox) return -ENOMEM; - smbox->shmem = core->shmem->setup_iomap(cinfo, dev, tx, NULL); + smbox->shmem = core->shmem->setup_iomap(cinfo, dev, tx, NULL, + &smbox->shmem_io_width); if (IS_ERR(smbox->shmem)) return PTR_ERR(smbox->shmem); @@ -298,7 +301,7 @@ static void mailbox_fetch_response(struct scmi_chan_info *cinfo, { struct scmi_mailbox *smbox = cinfo->transport_info; - core->shmem->fetch_response(smbox->shmem, xfer); + core->shmem->fetch_response(smbox->shmem, xfer, smbox->shmem_io_width); } static void mailbox_fetch_notification(struct scmi_chan_info *cinfo, @@ -306,7 +309,8 @@ static void mailbox_fetch_notification(struct scmi_chan_info *cinfo, { struct scmi_mailbox *smbox = cinfo->transport_info; - core->shmem->fetch_notification(smbox->shmem, max_len, xfer); + core->shmem->fetch_notification(smbox->shmem, max_len, xfer, + smbox->shmem_io_width); } static void mailbox_clear_channel(struct scmi_chan_info *cinfo) diff --git a/drivers/firmware/arm_scmi/scmi_transport_optee.c b/drivers/firmware/arm_scmi/scmi_transport_optee.c index 08911f40d1ff..9f6804647b29 100644 --- a/drivers/firmware/arm_scmi/scmi_transport_optee.c +++ b/drivers/firmware/arm_scmi/scmi_transport_optee.c @@ -350,7 +350,8 @@ static int setup_dynamic_shmem(struct device *dev, struct scmi_optee_channel *ch static int setup_static_shmem(struct device *dev, struct scmi_chan_info *cinfo, struct scmi_optee_channel *channel) { - channel->req.shmem = core->shmem->setup_iomap(cinfo, dev, true, NULL); + channel->req.shmem = core->shmem->setup_iomap(cinfo, dev, true, NULL, + NULL); if (IS_ERR(channel->req.shmem)) return PTR_ERR(channel->req.shmem); @@ -465,7 +466,7 @@ static int scmi_optee_send_message(struct scmi_chan_info *cinfo, ret = invoke_process_msg_channel(channel, core->msg->command_size(xfer)); } else { - core->shmem->tx_prepare(channel->req.shmem, xfer, cinfo); + core->shmem->tx_prepare(channel->req.shmem, xfer, cinfo, 0); ret = invoke_process_smt_channel(channel); } @@ -484,7 +485,7 @@ static void scmi_optee_fetch_response(struct scmi_chan_info *cinfo, core->msg->fetch_response(channel->req.msg, channel->rx_len, xfer); else - core->shmem->fetch_response(channel->req.shmem, xfer); + core->shmem->fetch_response(channel->req.shmem, xfer, 0); } static void scmi_optee_mark_txdone(struct scmi_chan_info *cinfo, int ret, diff --git a/drivers/firmware/arm_scmi/scmi_transport_smc.c b/drivers/firmware/arm_scmi/scmi_transport_smc.c index c6c69a17a9cc..4e7b2ac1c7e8 100644 --- a/drivers/firmware/arm_scmi/scmi_transport_smc.c +++ b/drivers/firmware/arm_scmi/scmi_transport_smc.c @@ -60,6 +60,7 @@ struct scmi_smc { int irq; struct scmi_chan_info *cinfo; struct scmi_shared_mem __iomem *shmem; + u32 shmem_io_width; /* Protect access to shmem area */ struct mutex shmem_lock; #define INFLIGHT_NONE MSG_TOKEN_MAX @@ -144,7 +145,8 @@ static int smc_chan_setup(struct scmi_chan_info *cinfo, struct device *dev, if (!scmi_info) return -ENOMEM; - scmi_info->shmem = core->shmem->setup_iomap(cinfo, dev, tx, &res); + scmi_info->shmem = core->shmem->setup_iomap(cinfo, dev, tx, &res, + &scmi_info->shmem_io_width); if (IS_ERR(scmi_info->shmem)) return PTR_ERR(scmi_info->shmem); @@ -229,7 +231,8 @@ static int smc_send_message(struct scmi_chan_info *cinfo, */ smc_channel_lock_acquire(scmi_info, xfer); - core->shmem->tx_prepare(scmi_info->shmem, xfer, cinfo); + core->shmem->tx_prepare(scmi_info->shmem, xfer, cinfo, + scmi_info->shmem_io_width); if (scmi_info->cap_id != ULONG_MAX) arm_smccc_1_1_invoke(scmi_info->func_id, scmi_info->cap_id, 0, @@ -253,7 +256,8 @@ static void smc_fetch_response(struct scmi_chan_info *cinfo, { struct scmi_smc *scmi_info = cinfo->transport_info; - core->shmem->fetch_response(scmi_info->shmem, xfer); + core->shmem->fetch_response(scmi_info->shmem, xfer, + scmi_info->shmem_io_width); } static void smc_mark_txdone(struct scmi_chan_info *cinfo, int ret, diff --git a/drivers/firmware/arm_scmi/shmem.c b/drivers/firmware/arm_scmi/shmem.c index 01d8a9398fe8..192262d63baa 100644 --- a/drivers/firmware/arm_scmi/shmem.c +++ b/drivers/firmware/arm_scmi/shmem.c @@ -34,9 +34,20 @@ struct scmi_shared_mem { u8 msg_payload[]; }; +#define __shmem_copy_toio_tpl(s) \ + for (unsigned int i = 0; i < xfer->tx.len; i += shmem_io_width) \ + iowrite##s(((u##s *)(xfer->tx.buf))[i / shmem_io_width], \ + shmem->msg_payload + i); + +#define __shmem_copy_fromio_tpl(s) \ + for (unsigned int i = 0; i < xfer->rx.len; i += shmem_io_width) \ + ((u##s *)(xfer->rx.buf))[i / shmem_io_width] = \ + ioread##s(shmem->msg_payload + shmem_io_width + i); + static void shmem_tx_prepare(struct scmi_shared_mem __iomem *shmem, struct scmi_xfer *xfer, - struct scmi_chan_info *cinfo) + struct scmi_chan_info *cinfo, + u32 shmem_io_width) { ktime_t stop; @@ -72,8 +83,25 @@ static void shmem_tx_prepare(struct scmi_shared_mem __iomem *shmem, &shmem->flags); iowrite32(sizeof(shmem->msg_header) + xfer->tx.len, &shmem->length); iowrite32(pack_scmi_header(&xfer->hdr), &shmem->msg_header); - if (xfer->tx.buf) - memcpy_toio(shmem->msg_payload, xfer->tx.buf, xfer->tx.len); + if (xfer->tx.buf) { + switch (shmem_io_width) { + case 1: + __shmem_copy_toio_tpl(8); + break; + case 2: + __shmem_copy_toio_tpl(16); + break; + case 4: + __shmem_copy_toio_tpl(32); + break; + case 8: + __shmem_copy_toio_tpl(64); + break; + default: + memcpy_toio(shmem->msg_payload, xfer->tx.buf, xfer->tx.len); + break; + } + } } static u32 shmem_read_header(struct scmi_shared_mem __iomem *shmem) @@ -81,8 +109,34 @@ static u32 shmem_read_header(struct scmi_shared_mem __iomem *shmem) return ioread32(&shmem->msg_header); } +static void __shmem_fetch_resp_notif_data(struct scmi_xfer *xfer, + struct scmi_shared_mem __iomem *shmem, + u32 shmem_io_width) +{ + /* Take a copy to the rx buffer.. */ + switch (shmem_io_width) { + case 1: + __shmem_copy_fromio_tpl(8); + break; + case 2: + __shmem_copy_fromio_tpl(16); + break; + case 4: + __shmem_copy_fromio_tpl(32); + break; + case 8: + __shmem_copy_fromio_tpl(32); + break; + default: + memcpy_fromio(xfer->rx.buf, shmem->msg_payload + 4, + xfer->rx.len); + break; + } +} + static void shmem_fetch_response(struct scmi_shared_mem __iomem *shmem, - struct scmi_xfer *xfer) + struct scmi_xfer *xfer, + u32 shmem_io_width) { size_t len = ioread32(&shmem->length); @@ -90,20 +144,19 @@ static void shmem_fetch_response(struct scmi_shared_mem __iomem *shmem, /* Skip the length of header and status in shmem area i.e 8 bytes */ xfer->rx.len = min_t(size_t, xfer->rx.len, len > 8 ? len - 8 : 0); - /* Take a copy to the rx buffer.. */ - memcpy_fromio(xfer->rx.buf, shmem->msg_payload + 4, xfer->rx.len); + __shmem_fetch_resp_notif_data(xfer, shmem, shmem_io_width); } static void shmem_fetch_notification(struct scmi_shared_mem __iomem *shmem, - size_t max_len, struct scmi_xfer *xfer) + size_t max_len, struct scmi_xfer *xfer, + u32 shmem_io_width) { size_t len = ioread32(&shmem->length); /* Skip only the length of header in shmem area i.e 4 bytes */ xfer->rx.len = min_t(size_t, max_len, len > 4 ? len - 4 : 0); - /* Take a copy to the rx buffer.. */ - memcpy_fromio(xfer->rx.buf, shmem->msg_payload, xfer->rx.len); + __shmem_fetch_resp_notif_data(xfer, shmem, shmem_io_width); } static void shmem_clear_channel(struct scmi_shared_mem __iomem *shmem) @@ -139,7 +192,8 @@ static bool shmem_channel_intr_enabled(struct scmi_shared_mem __iomem *shmem) static void __iomem *shmem_setup_iomap(struct scmi_chan_info *cinfo, struct device *dev, bool tx, - struct resource *res) + struct resource *res, + u32 *shmem_io_width) { struct device_node *shmem __free(device_node); const char *desc = tx ? "Tx" : "Rx"; @@ -173,6 +227,9 @@ static void __iomem *shmem_setup_iomap(struct scmi_chan_info *cinfo, return IOMEM_ERR_PTR(-EADDRNOTAVAIL); } + if (shmem_io_width) + of_property_read_u32(shmem, "reg-io-width", shmem_io_width); + return addr; }
Some shared memory areas might only support a certain access width, (e.g.: 32 bits accesses only). Update the shmem layer to support reading from and writing to such shared memory area using the specified I/O width in the Device Tree. The various transport layers making use of the shmem.c code are updated accordingly to pass the I/O width to the routines that need it. Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com> --- drivers/firmware/arm_scmi/common.h | 14 +++- .../arm_scmi/scmi_transport_mailbox.c | 12 ++- .../firmware/arm_scmi/scmi_transport_optee.c | 7 +- .../firmware/arm_scmi/scmi_transport_smc.c | 10 ++- drivers/firmware/arm_scmi/shmem.c | 77 ++++++++++++++++--- 5 files changed, 96 insertions(+), 24 deletions(-)