| Message ID | 20200306042831.17827-1-elder@linaro.org |
|---|---|
| Headers | show |
| Series | net: introduce Qualcomm IPA driver (UPDATED) | expand |
On Thu, Mar 05, 2020 at 10:28:15PM -0600, Alex Elder wrote: > Set up a subdev in the q6v5 modem remoteproc driver that generates > event notifications for the IPA driver to use for initialization and > recovery following a modem shutdown or crash. > > A pair of new functions provides a way for the IPA driver to register > and deregister a notification callback function that will be called > whenever modem events (about to boot, running, about to shut down, > etc.) occur. A void pointer value (provided by the IPA driver at > registration time) and an event type are supplied to the callback > function. > > One event, MODEM_REMOVING, is signaled whenever the q6v5 driver is > about to remove the notification subdevice. It requires the IPA > driver de-register its callback. > > This sub-device is only used by the modem subsystem (MSS) driver, > so the code that adds the new subdev and allows registration and > deregistration of the notifier is found in "qcom_q6v6_mss.c". > > Signed-off-by: Alex Elder <elder@linaro.org> > --- > drivers/remoteproc/Kconfig | 6 ++ > drivers/remoteproc/Makefile | 1 + > drivers/remoteproc/qcom_q6v5_ipa_notify.c | 85 +++++++++++++++++++ > drivers/remoteproc/qcom_q6v5_mss.c | 38 +++++++++ > .../linux/remoteproc/qcom_q6v5_ipa_notify.h | 82 ++++++++++++++++++ > 5 files changed, 212 insertions(+) > create mode 100644 drivers/remoteproc/qcom_q6v5_ipa_notify.c > create mode 100644 include/linux/remoteproc/qcom_q6v5_ipa_notify.h > > diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig > index de3862c15fcc..56084635dd63 100644 > --- a/drivers/remoteproc/Kconfig > +++ b/drivers/remoteproc/Kconfig > @@ -167,6 +167,12 @@ config QCOM_Q6V5_WCSS > Say y here to support the Qualcomm Peripheral Image Loader for the > Hexagon V5 based WCSS remote processors. > > +config QCOM_Q6V5_IPA_NOTIFY > + tristate > + depends on QCOM_IPA > + depends on QCOM_Q6V5_MSS > + default QCOM_IPA > + > config QCOM_SYSMON > tristate "Qualcomm sysmon driver" > depends on RPMSG > diff --git a/drivers/remoteproc/Makefile b/drivers/remoteproc/Makefile > index e30a1b15fbac..0effd3825035 100644 > --- a/drivers/remoteproc/Makefile > +++ b/drivers/remoteproc/Makefile > @@ -21,6 +21,7 @@ obj-$(CONFIG_QCOM_Q6V5_ADSP) += qcom_q6v5_adsp.o > obj-$(CONFIG_QCOM_Q6V5_MSS) += qcom_q6v5_mss.o > obj-$(CONFIG_QCOM_Q6V5_PAS) += qcom_q6v5_pas.o > obj-$(CONFIG_QCOM_Q6V5_WCSS) += qcom_q6v5_wcss.o > +obj-$(CONFIG_QCOM_Q6V5_IPA_NOTIFY) += qcom_q6v5_ipa_notify.o > obj-$(CONFIG_QCOM_SYSMON) += qcom_sysmon.o > obj-$(CONFIG_QCOM_WCNSS_PIL) += qcom_wcnss_pil.o > qcom_wcnss_pil-y += qcom_wcnss.o > diff --git a/drivers/remoteproc/qcom_q6v5_ipa_notify.c b/drivers/remoteproc/qcom_q6v5_ipa_notify.c > new file mode 100644 > index 000000000000..e1c10a128bfd > --- /dev/null > +++ b/drivers/remoteproc/qcom_q6v5_ipa_notify.c > @@ -0,0 +1,85 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +/* > + * Qualcomm IPA notification subdev support > + * > + * Copyright (C) 2019 Linaro Ltd. > + */ > + > +#include <linux/kernel.h> > +#include <linux/module.h> > +#include <linux/remoteproc.h> > +#include <linux/remoteproc/qcom_q6v5_ipa_notify.h> > + > +static void > +ipa_notify_common(struct rproc_subdev *subdev, enum qcom_rproc_event event) > +{ > + struct qcom_rproc_ipa_notify *ipa_notify; > + qcom_ipa_notify_t notify; > + > + ipa_notify = container_of(subdev, struct qcom_rproc_ipa_notify, subdev); > + notify = ipa_notify->notify; > + if (notify) > + notify(ipa_notify->data, event); > +} > + > +static int ipa_notify_prepare(struct rproc_subdev *subdev) > +{ > + ipa_notify_common(subdev, MODEM_STARTING); > + > + return 0; > +} > + > +static int ipa_notify_start(struct rproc_subdev *subdev) > +{ > + ipa_notify_common(subdev, MODEM_RUNNING); > + > + return 0; > +} > + > +static void ipa_notify_stop(struct rproc_subdev *subdev, bool crashed) > + > +{ > + ipa_notify_common(subdev, crashed ? MODEM_CRASHED : MODEM_STOPPING); > +} > + > +static void ipa_notify_unprepare(struct rproc_subdev *subdev) > +{ > + ipa_notify_common(subdev, MODEM_OFFLINE); > +} > + > +static void ipa_notify_removing(struct rproc_subdev *subdev) > +{ > + ipa_notify_common(subdev, MODEM_REMOVING); > +} > + > +/* Register the IPA notification subdevice with the Q6V5 MSS remoteproc */ > +void qcom_add_ipa_notify_subdev(struct rproc *rproc, > + struct qcom_rproc_ipa_notify *ipa_notify) > +{ > + ipa_notify->notify = NULL; > + ipa_notify->data = NULL; > + ipa_notify->subdev.prepare = ipa_notify_prepare; > + ipa_notify->subdev.start = ipa_notify_start; > + ipa_notify->subdev.stop = ipa_notify_stop; > + ipa_notify->subdev.unprepare = ipa_notify_unprepare; > + > + rproc_add_subdev(rproc, &ipa_notify->subdev); > +} > +EXPORT_SYMBOL_GPL(qcom_add_ipa_notify_subdev); > + > +/* Remove the IPA notification subdevice */ > +void qcom_remove_ipa_notify_subdev(struct rproc *rproc, > + struct qcom_rproc_ipa_notify *ipa_notify) > +{ > + struct rproc_subdev *subdev = &ipa_notify->subdev; > + > + ipa_notify_removing(subdev); > + > + rproc_remove_subdev(rproc, subdev); > + ipa_notify->notify = NULL; /* Make it obvious */ > +} > +EXPORT_SYMBOL_GPL(qcom_remove_ipa_notify_subdev); > + > +MODULE_LICENSE("GPL v2"); > +MODULE_DESCRIPTION("Qualcomm IPA notification remoteproc subdev"); > diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c > index a1cc9cbe038f..f9ccce76e44b 100644 > --- a/drivers/remoteproc/qcom_q6v5_mss.c > +++ b/drivers/remoteproc/qcom_q6v5_mss.c > @@ -22,6 +22,7 @@ > #include <linux/regmap.h> > #include <linux/regulator/consumer.h> > #include <linux/remoteproc.h> > +#include "linux/remoteproc/qcom_q6v5_ipa_notify.h" > #include <linux/reset.h> > #include <linux/soc/qcom/mdt_loader.h> > #include <linux/iopoll.h> > @@ -201,6 +202,7 @@ struct q6v5 { > struct qcom_rproc_glink glink_subdev; > struct qcom_rproc_subdev smd_subdev; > struct qcom_rproc_ssr ssr_subdev; > + struct qcom_rproc_ipa_notify ipa_notify_subdev; > struct qcom_sysmon *sysmon; > bool need_mem_protection; > bool has_alt_reset; > @@ -1540,6 +1542,39 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc) > return 0; > } > > +#if IS_ENABLED(CONFIG_QCOM_Q6V5_IPA_NOTIFY) > + > +/* Register IPA notification function */ > +int qcom_register_ipa_notify(struct rproc *rproc, qcom_ipa_notify_t notify, > + void *data) > +{ > + struct qcom_rproc_ipa_notify *ipa_notify; > + struct q6v5 *qproc = rproc->priv; > + > + if (!notify) > + return -EINVAL; > + > + ipa_notify = &qproc->ipa_notify_subdev; > + if (ipa_notify->notify) > + return -EBUSY; > + > + ipa_notify->notify = notify; > + ipa_notify->data = data; > + > + return 0; > +} > +EXPORT_SYMBOL_GPL(qcom_register_ipa_notify); > + > +/* Deregister IPA notification function */ > +void qcom_deregister_ipa_notify(struct rproc *rproc) > +{ > + struct q6v5 *qproc = rproc->priv; > + > + qproc->ipa_notify_subdev.notify = NULL; > +} > +EXPORT_SYMBOL_GPL(qcom_deregister_ipa_notify); > +#endif /* !IS_ENABLED(CONFIG_QCOM_Q6V5_IPA_NOTIFY) */ > + > static int q6v5_probe(struct platform_device *pdev) > { > const struct rproc_hexagon_res *desc; > @@ -1664,6 +1699,7 @@ static int q6v5_probe(struct platform_device *pdev) > qcom_add_glink_subdev(rproc, &qproc->glink_subdev); > qcom_add_smd_subdev(rproc, &qproc->smd_subdev); > qcom_add_ssr_subdev(rproc, &qproc->ssr_subdev, "mpss"); > + qcom_add_ipa_notify_subdev(rproc, &qproc->ipa_notify_subdev); > qproc->sysmon = qcom_add_sysmon_subdev(rproc, "modem", 0x12); > if (IS_ERR(qproc->sysmon)) { > ret = PTR_ERR(qproc->sysmon); > @@ -1677,6 +1713,7 @@ static int q6v5_probe(struct platform_device *pdev) > return 0; > > detach_proxy_pds: > + qcom_remove_ipa_notify_subdev(qproc->rproc, &qproc->ipa_notify_subdev); > q6v5_pds_detach(qproc, qproc->proxy_pds, qproc->proxy_pd_count); > detach_active_pds: > q6v5_pds_detach(qproc, qproc->active_pds, qproc->active_pd_count); > @@ -1693,6 +1730,7 @@ static int q6v5_remove(struct platform_device *pdev) > rproc_del(qproc->rproc); > > qcom_remove_sysmon_subdev(qproc->sysmon); > + qcom_remove_ipa_notify_subdev(qproc->rproc, &qproc->ipa_notify_subdev); > qcom_remove_glink_subdev(qproc->rproc, &qproc->glink_subdev); > qcom_remove_smd_subdev(qproc->rproc, &qproc->smd_subdev); > qcom_remove_ssr_subdev(qproc->rproc, &qproc->ssr_subdev); > diff --git a/include/linux/remoteproc/qcom_q6v5_ipa_notify.h b/include/linux/remoteproc/qcom_q6v5_ipa_notify.h > new file mode 100644 > index 000000000000..0820edc0ab7d > --- /dev/null > +++ b/include/linux/remoteproc/qcom_q6v5_ipa_notify.h > @@ -0,0 +1,82 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > + > +/* Copyright (C) 2019 Linaro Ltd. */ > + > +#ifndef __QCOM_Q6V5_IPA_NOTIFY_H__ > +#define __QCOM_Q6V5_IPA_NOTIFY_H__ > + > +#if IS_ENABLED(CONFIG_QCOM_Q6V5_IPA_NOTIFY) Why don't you put this guard in the places where such include is called? Or the best variant is to ensure that this include is compiled in only in CONFIG_QCOM_Q6V5_IPA_NOTIFY flows. That is more common way to guard internal header files. Thanks
On 3/11/20 5:54 AM, Jon Hunter wrote: > > On 06/03/2020 04:28, Alex Elder wrote: >> Add build and Kconfig support for the Qualcomm IPA driver. >> >> Signed-off-by: Alex Elder <elder@linaro.org> >> --- >> drivers/net/Kconfig | 2 ++ >> drivers/net/Makefile | 1 + >> drivers/net/ipa/Kconfig | 19 +++++++++++++++++++ >> drivers/net/ipa/Makefile | 12 ++++++++++++ >> 4 files changed, 34 insertions(+) >> create mode 100644 drivers/net/ipa/Kconfig >> create mode 100644 drivers/net/ipa/Makefile >> >> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig >> index 66e410e58c8e..02565bc2be8a 100644 >> --- a/drivers/net/Kconfig >> +++ b/drivers/net/Kconfig >> @@ -444,6 +444,8 @@ source "drivers/net/fddi/Kconfig" >> >> source "drivers/net/hippi/Kconfig" >> >> +source "drivers/net/ipa/Kconfig" >> + >> config NET_SB1000 >> tristate "General Instruments Surfboard 1000" >> depends on PNP >> diff --git a/drivers/net/Makefile b/drivers/net/Makefile >> index 65967246f240..94b60800887a 100644 >> --- a/drivers/net/Makefile >> +++ b/drivers/net/Makefile >> @@ -47,6 +47,7 @@ obj-$(CONFIG_ETHERNET) += ethernet/ >> obj-$(CONFIG_FDDI) += fddi/ >> obj-$(CONFIG_HIPPI) += hippi/ >> obj-$(CONFIG_HAMRADIO) += hamradio/ >> +obj-$(CONFIG_QCOM_IPA) += ipa/ >> obj-$(CONFIG_PLIP) += plip/ >> obj-$(CONFIG_PPP) += ppp/ >> obj-$(CONFIG_PPP_ASYNC) += ppp/ >> diff --git a/drivers/net/ipa/Kconfig b/drivers/net/ipa/Kconfig >> new file mode 100644 >> index 000000000000..b8cb7cadbf75 >> --- /dev/null >> +++ b/drivers/net/ipa/Kconfig >> @@ -0,0 +1,19 @@ >> +config QCOM_IPA >> + tristate "Qualcomm IPA support" >> + depends on ARCH_QCOM && 64BIT && NET >> + select QCOM_QMI_HELPERS >> + select QCOM_MDT_LOADER >> + default QCOM_Q6V5_COMMON >> + help >> + Choose Y or M here to include support for the Qualcomm >> + IP Accelerator (IPA), a hardware block present in some >> + Qualcomm SoCs. The IPA is a programmable protocol processor >> + that is capable of generic hardware handling of IP packets, >> + including routing, filtering, and NAT. Currently the IPA >> + driver supports only basic transport of network traffic >> + between the AP and modem, on the Qualcomm SDM845 SoC. >> + >> + Note that if selected, the selection type must match that >> + of QCOM_Q6V5_COMMON (Y or M). >> + >> + If unsure, say N. >> diff --git a/drivers/net/ipa/Makefile b/drivers/net/ipa/Makefile >> new file mode 100644 >> index 000000000000..afe5df1e6eee >> --- /dev/null >> +++ b/drivers/net/ipa/Makefile >> @@ -0,0 +1,12 @@ >> +# Un-comment the next line if you want to validate configuration data >> +#ccflags-y += -DIPA_VALIDATE >> + >> +obj-$(CONFIG_QCOM_IPA) += ipa.o >> + >> +ipa-y := ipa_main.o ipa_clock.o ipa_reg.o ipa_mem.o \ >> + ipa_table.o ipa_interrupt.o gsi.o gsi_trans.o \ >> + ipa_gsi.o ipa_smp2p.o ipa_uc.o \ >> + ipa_endpoint.o ipa_cmd.o ipa_modem.o \ >> + ipa_qmi.o ipa_qmi_msg.o >> + >> +ipa-y += ipa_data-sdm845.o ipa_data-sc7180. Yes, a needed patch defining field_max() is missing. I sent an updated request to include it in net-next to resolve this issue. https://lore.kernel.org/netdev/20200311024240.26834-1-elder@linaro.org/ Thank you for pointing it out. -Alex > This patch is also causing build issues on the current -next ... > > CC [M] drivers/net/ipa/gsi.o > In file included from include/linux/build_bug.h:5:0, > from include/linux/bitfield.h:10, > from drivers/net/ipa/gsi.c:9: > drivers/net/ipa/gsi.c: In function ‘gsi_validate_build’: > drivers/net/ipa/gsi.c:220:39: error: implicit declaration of function ‘field_max’ [-Werror=implicit-function-declaration] > BUILD_BUG_ON(GSI_RING_ELEMENT_SIZE > field_max(ELEMENT_SIZE_FMASK)); > ^ > include/linux/compiler.h:374:9: note: in definition of macro ‘__compiletime_assert’ > if (!(condition)) \ > ^~~~~~~~~ > include/linux/compiler.h:394:2: note: in expansion of macro ‘_compiletime_assert’ > _compiletime_assert(condition, msg, __compiletime_assert_, __LINE__) > ^~~~~~~~~~~~~~~~~~~ > include/linux/build_bug.h:39:37: note: in expansion of macro ‘compiletime_assert’ > #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) > ^~~~~~~~~~~~~~~~~~ > include/linux/build_bug.h:50:2: note: in expansion of macro ‘BUILD_BUG_ON_MSG’ > BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition) > ^~~~~~~~~~~~~~~~ > drivers/net/ipa/gsi.c:220:2: note: in expansion of macro ‘BUILD_BUG_ON’ > BUILD_BUG_ON(GSI_RING_ELEMENT_SIZE > field_max(ELEMENT_SIZE_FMASK)); > ^~~~~~~~~~~~ > > Jon >
On 3/9/20 11:54 AM, Dave Taht wrote: > I am happy to see this driver upstream. > >> Arnd's concern was that the rmnet_data0 network device does not >> have the benefit of information about the state of the underlying >> IPA hardware in order to be effective in controlling TX flow. >> The feared result is over-buffering of TX packets (bufferbloat). >> I began working on some simple experiments to see whether (or how >> much) his concern was warranted. But it turned out that completing >> these experiments was much more work than had been hoped. > > Members of the bufferbloat project *care*, and have tools and testbeds for > exploring these issues. It would be good to establish a relationship with > the vendor, obtain hardware, and other (technical and financial) support, if > possible. > > Is there any specific hardware now available (generally or in beta) that > can be obtained by us to take a harder look? A contact at linaro or QCA > willing discuss options? There exists some hardware that could be used, but at the moment I have not ported this code to operate on it. It is a current effort however, and I will be glad to keep you in the loop on progress. There are a couple of target environments we'd like to support but until last week the primary goal was inclusion in the upstream tree. I will follow up with you after the dust settles a little bit with this patch series, maybe in a week or so. In the mean time I'll also find out whether there are any other resources (people and/or hardware) available. -Alex
On Thu, Mar 5, 2020 at 8:28 PM Alex Elder <elder@linaro.org> wrote: > > This series presents the driver for the Qualcomm IP Accelerator (IPA). > > This is version 2 of this updated series. It includes the following > small changes since the previous version: > - Now based on net-next instead of v5.6-rc > - Config option now named CONFIG_QCOM_IPA > - Some minor cleanup in the GSI code > - Small change to replenish logic > - No longer depends on remoteproc bug fixes > What follows is the basically same explanation as was posted previously. > > -Alex > > I have posted earlier versions of this code previously, but it has > undergone quite a bit of development since the last time, so rather > than calling it "version 3" I'm just treating it as a new series > (indicating it's been updated in this message). The fast/data path > is the same as before. But the driver now (nearly) supports a > second platform, its transaction handling has been generalized > and improved, and modem activities are now handled in a more > unified way. > > This series is available (based on net-next in branch "ipa_updated-v2" > in this git repository: > https://git.linaro.org/people/alex.elder/linux.git > > The branch depends on other one other small patch that I sent out > for review earlier. > https://lore.kernel.org/lkml/20200306042302.17602-1-elder@linaro.org/ > I realize this is all already in (yay!), but it took me a long time to get around to fully reading this driver. I'll paste my notes here for posterity or possible future patches. Overall the driver seemed well documented and thoughtfully written. As someone who has seen the old downstream IPA driver (though I didn't look long as my brain started hurting), I greatly appreciate the work required by Alex to polish this all up. So firstly, thanks Alex! Onto the notes. There are a couple themes I noticed. The driver seems occasionally to be unnecessarily layer-caked. I noticed "could be inlined" as a common refrain in my feedback. There are also a couple places with hand-rolled refcounting, atomic exchanges, and odd mutexes. I haven't fully digested those to be able to know how to get rid of them, but I'll point them out as something that "doesn't smell quite right". Acronyms (for my own benefit): ee - execution environment ep - endpoint er - endpoint or route ID rt - resource type dcd - Dynamic clock division (request to GCC to turn you off) bcr - Backwards compatibility register comp - Core master port holb - ??? ipa_main.c: What is IPA_VALIDATION. Can this just be on always or removed? otherwise it will likely bit rot. I'd like to see this suspend_ref go away. ipa_reg.c can be inlined ipa_mem_init can be inlined. IPA_NOTIFY: Shouldn't CONFIG_IPA depend on IPA_NOTIFY? ipa_data.h Why are ipa_resource_src and ipa_resource_dst separate structures? maybe the extern globals at the bottom should just be moved into ipa_main.c ipa_endpoint.h Add a note for enum ipa_endpoint_name indicating who is TXing and RXing ipa_data-sc7180.c Where is IPA_ENDPOINT_MODEM_LAN_TX definition? ipa_clock.c IPA_CORE_CLOCK_RATE - Should probably be specified in DT as a fixed frequency rather than here in code. Interconnect bandwidths - Are these a function of the core clock rate? This may be fine for the initial version, but is there any way to derive the bandwidth requirement? ipa_interconnect_init_one - Probably best to just inline this ipa_clock_get_additional - Seems sketchy, would like to remove this Overall don't like the homebrew reference counting here. Would runtime PM help you do this? ipa_interrupt.h I'd like to get rid of ipa_interrupt_add and ipa_interrupt_remove. Seems like there's no need for these to be dynamically added, it's all one driver. ipa_interrupt.c Why does ipa_interrupt_setup() need to dynamically allocate the structure, can't we just embed it in struct ipa? Without the kzalloc, ipa_interrupt_setup() and ipa_interrupt_teardown() are simple enough they can probably be inlined (at least teardown for sure). Interrupt processing seems a little odd. What I would have expected is: Hard ISR reads pending bits, and immediately writes all pending bits to quiesce them. Save bitmask of pending bits, and send to the threaded handler. Threaded handler then reads and clears pending bits out, and acts on any. Fixes interrupt storm in ipa_isr() if an unexpected interrupt comes in but an expected interrupt is also pending. Avoids multiple register writes (one for each bit) in ipa_interrupt_process() Saves all the register reads in ipa_interrupt_process_all(). That additional read in the loop seems like it shouldn't be there either way. ipa_mem.h Is IPA_SHARED_MEM_SIZE supposed to be defined? It's mentioned in the comment. Comment says the number of canaries is the same for all IPA versions, but ipa_data-sdm845.c and ipa_data-sc7180.c seem to have different canary counts for IPA_MEM_UC_INFO? Should the number of canaries really be part of the chipset-specific config info if it's never going to change? Do the canary values eat into the previous region? Can we add a warning to ensure we don't write canary values off the beginning of the memory region? ipa_mem.c Maybe remove ipa_mem_teardown() if we're not planning to add anything to it soon, or inline it in the header for now. Does ipa_mem_zero_modem() erase canary values previously set up? gsi.h Why make gsi_evt_ring_state 0xf? Remove assignments and let enum do its thing. enum gsi_ee_id - Probably worth commenting that this defines the layout of the per-EE register regions, so rearranging this would horribly break our access to hardware. gsi_reg.h What is gsi v2.0? Is that the same as IPA 4.0? Why do the channel macros have things like CH_C and EE_N in them? Why not just CH and EE? Oh, I also see CH_E, what's that? gsi.c: enum gsi_err_code: Where's 0x7? gsi_channel_deprogram(): delete gsi_channel_update(): I'm worried about this refcount thing, how does it work? gsi_event_bitmap_init() can be inlined gsi_evt_ring_setup() and gsi_evt_ring_teardown() can be removed gsi_teardown(): inline gsi_evt_ring_exit(): remove ipa_gsi.h: Comment for ipa_gsi_channel_tx_completed has wrong function name copypasta. ipa_gsi.c: This is an interesting mezzanine interface, it looks like it was designed to keep GSI code from calling IPA code directly. Why is that? Could these at least be inlined into the ipa_gsi.h? gsi_trans.h: Why is it important that struct gsi_trans be < 128 bytes? gsi_trans.c: gsi_tre_type - Should this be in a header? TRE_FLAGS_ - Should these be in a header? Also, replace GENMASK(x,x) with BIT(x). TRE_FLAGS_IEOB_FMASK is never used (which is fine, but should it be?) gsi_trans_tre_reserve() - Why atomic_try_cmpxchg? What's the difference between that and atomic_cmpxchg? gsi_tre_len_opcode() - If len is truncated to 16 bits, why is u32 passed in? Is len sometimes used as 32 bits? gsi_trans_tre_fill() - If it doesn't do a 16-byte atomic write, is this a problem? Could the controller see a half-baked TRE? ipa_endpoint.c: What is HOLB timer? ipa_table.c: ipa_table_valid() - This just runs all 3-bit possibilities. Could use flags and a loop instead. ipa_table_teardown() - Remove? ipa_cmd.c: ipa_cmd_tag_process_add() - What happened here? Is this just functionality we're not using right now? ipa_modem.c ipa_start_xmit() - Could returning BUSY result in an infinite loop if something goes wrong in the lower layers? ipa_modem_start() - Shouldn't we print some errors if the state variable has an unexpected value (ie not RUNNING)? In those cases we are likely not in a good place. ipa_qmi.c: ipa_qmi_indication() could be inlined init_modem_driver_req() use of static means this can never run concurrently with itself, right? Also if the request gets stuck in qmi_txn_wait() you're hosed. ipa_qmi_msg.c You could macro-ize the initialization of these elements, which would make things way shorter, and probably easier to read. I'm imagining for instance the first element in the file could be reduced to IPA_QMI_ELEM(QMI_OPT_FLAG, 1, struct ipa_indication_register_req, master_driver_init_complete_valid, 0x10) ipa_smp2p.c: s/Motex/Mutex/ Actually I don't get why the mutex is needed at all. It's certainly not needed in ipa_smp2p_disable() (stores are already atomic), and threaded irqs already have mutual exclusion. Or are you trying to make sure ipa_smp2p_disable() doesn't return until ipa_smp2p_modem_setup_ready_isr() has fully completed? If that's really why, you should explain that's what it's doing and why it's necessary. Thinking more about it, why can't you just actually disable the irq? That calls synchronize_irq, which will flush out any instances of the irq running. Then no mutex necessary! ipa_smp2p_irq_init(), and _exit() can be inlined. I'd love to see clock_on and the weird reference counting go away. Is that really necessary?
This series presents the driver for the Qualcomm IP Accelerator (IPA). This is version 2 of this updated series. It includes the following small changes since the previous version: - Now based on net-next instead of v5.6-rc - Config option now named CONFIG_QCOM_IPA - Some minor cleanup in the GSI code - Small change to replenish logic - No longer depends on remoteproc bug fixes What follows is the basically same explanation as was posted previously. -Alex I have posted earlier versions of this code previously, but it has undergone quite a bit of development since the last time, so rather than calling it "version 3" I'm just treating it as a new series (indicating it's been updated in this message). The fast/data path is the same as before. But the driver now (nearly) supports a second platform, its transaction handling has been generalized and improved, and modem activities are now handled in a more unified way. This series is available (based on net-next in branch "ipa_updated-v2" in this git repository: https://git.linaro.org/people/alex.elder/linux.git The branch depends on other one other small patch that I sent out for review earlier. https://lore.kernel.org/lkml/20200306042302.17602-1-elder@linaro.org/ I want to address some of the discussion that arose last time. First, there was the WWAN discussion. Here's the history: - This was last posted nine months ago. - Reviewers at that time favored developing a new WWAN subsystem that would be used for managing devices like this. And the suggestion was to not accept this driver until that could be developed. - Along the way, Apple acquired much of Intel's modem business. And as a result, the generic framework became less pressing. - I did participate in the WWAN subsystem design however, and although it went dormant for a while it's been resurrected: https://lore.kernel.org/netdev/20200225100053.16385-1-johannes@sipsolutions.net/ - Unfortunately the proposed WWAN design was not an easy fit with Qualcomm's integrated modem interfaces. Given that rmnet is a supported link type for in the upstream "iproute2" package (more on this below), I have opted not to integrate with any WWAN subsystem. So in summary, this driver does not integrate with a generic WWAN framework. And I'd like it to be accepted upstream despite that. Next, Arnd Bergmann had some concerns about flow control. (Note: some of my discussions with Arnd about this were offline.) The overall architecture here also involves the "rmnet" driver: drivers/net/ethernet/qualcomm/rmnet The rmnet driver presents a network device for use. It connects with another network device presented, by the IPA driver. The rmnet driver wraps (and unwraps) packets transferred to (and from) the IPA driver with QMAP headers. --------------- | rmnet_data0 | <-- "real" netdev --------------- || }- QMAP spoken here -------------- | rmnet_ipa0 | <-- also netdev, transporting QMAP packets -------------- || -------------- ( IPA hardware ) -------------- Arnd's concern was that the rmnet_data0 network device does not have the benefit of information about the state of the underlying IPA hardware in order to be effective in controlling TX flow. The feared result is over-buffering of TX packets (bufferbloat). I began working on some simple experiments to see whether (or how much) his concern was warranted. But it turned out that completing these experiments was much more work than had been hoped. The rmnet driver is present in the upstream kernel. There is also support for the rmnet link type in the upstream "ip" user space command in the "iproute2" package. Changing the layering of rmnet over IPA likely involves deprecating the rmnet driver and its support in "iproute2". I would really rather not go down that path. There is precedent for this sort of layering of network devices (L2TP, VLAN). And any architecture like this would suffer the issues Arnd mentioned; the problem is not limited to rmnet and IPA. I do think this is a problem worth solving, but the prudent thing to do might be to try to solve it more generally. So to summarize on this issue, this driver does not attempt to change the way the rmnet and IPA drivers work together. And even though I think Arnd's concerns warrant more investigation, I'd like this driver to to be accepted upstream without any change to this architecture. Finally, a more technical description for the series, and some acknowledgements to some people who contributed to it. The IPA is a component present in some Qualcomm SoCs that allows network functions such as aggregation, filtering, routing, and NAT to be performed without active involvement of the main application processor (AP). In this initial patch series these advanced features are not implemented. The IPA driver simply provides a network interface that makes the modem's LTE network available in Linux. This initial series supports only the Qualcomm SDM845 SoC. The Qualcomm SC7180 SoC is partially supported, and support for other platforms will follow. This code is derived from a driver developed by Qualcomm. A version of the original source can be seen here: https://source.codeaurora.org/quic/la/kernel/msm-4.9/tree in the "drivers/platform/msm/ipa" directory. Many were involved in developing this, but the following individuals deserve explicit acknowledgement for their substantial contributions: Abhishek Choubey Ady Abraham Chaitanya Pratapa David Arinzon Ghanim Fodi Gidon Studinski Ravi Gummadidala Shihuan Liu Skylar Chang -Alex Alex Elder (17): remoteproc: add IPA notification to q6v5 driver dt-bindings: soc: qcom: add IPA bindings soc: qcom: ipa: main code soc: qcom: ipa: configuration data soc: qcom: ipa: clocking, interrupts, and memory soc: qcom: ipa: GSI headers soc: qcom: ipa: the generic software interface soc: qcom: ipa: IPA interface to GSI soc: qcom: ipa: GSI transactions soc: qcom: ipa: IPA endpoints soc: qcom: ipa: filter and routing tables soc: qcom: ipa: immediate commands soc: qcom: ipa: modem and microcontroller soc: qcom: ipa: AP/modem communications soc: qcom: ipa: support build of IPA code MAINTAINERS: add entry for the Qualcomm IPA driver arm64: dts: sdm845: add IPA information .../devicetree/bindings/net/qcom,ipa.yaml | 192 ++ MAINTAINERS | 6 + arch/arm64/boot/dts/qcom/sdm845.dtsi | 51 + drivers/net/Kconfig | 2 + drivers/net/Makefile | 1 + drivers/net/ipa/Kconfig | 19 + drivers/net/ipa/Makefile | 12 + drivers/net/ipa/gsi.c | 2055 +++++++++++++++++ drivers/net/ipa/gsi.h | 257 +++ drivers/net/ipa/gsi_private.h | 118 + drivers/net/ipa/gsi_reg.h | 417 ++++ drivers/net/ipa/gsi_trans.c | 786 +++++++ drivers/net/ipa/gsi_trans.h | 226 ++ drivers/net/ipa/ipa.h | 148 ++ drivers/net/ipa/ipa_clock.c | 313 +++ drivers/net/ipa/ipa_clock.h | 53 + drivers/net/ipa/ipa_cmd.c | 680 ++++++ drivers/net/ipa/ipa_cmd.h | 195 ++ drivers/net/ipa/ipa_data-sc7180.c | 307 +++ drivers/net/ipa/ipa_data-sdm845.c | 329 +++ drivers/net/ipa/ipa_data.h | 280 +++ drivers/net/ipa/ipa_endpoint.c | 1707 ++++++++++++++ drivers/net/ipa/ipa_endpoint.h | 110 + drivers/net/ipa/ipa_gsi.c | 54 + drivers/net/ipa/ipa_gsi.h | 60 + drivers/net/ipa/ipa_interrupt.c | 253 ++ drivers/net/ipa/ipa_interrupt.h | 117 + drivers/net/ipa/ipa_main.c | 954 ++++++++ drivers/net/ipa/ipa_mem.c | 314 +++ drivers/net/ipa/ipa_mem.h | 90 + drivers/net/ipa/ipa_modem.c | 383 +++ drivers/net/ipa/ipa_modem.h | 31 + drivers/net/ipa/ipa_qmi.c | 538 +++++ drivers/net/ipa/ipa_qmi.h | 41 + drivers/net/ipa/ipa_qmi_msg.c | 663 ++++++ drivers/net/ipa/ipa_qmi_msg.h | 252 ++ drivers/net/ipa/ipa_reg.c | 38 + drivers/net/ipa/ipa_reg.h | 476 ++++ drivers/net/ipa/ipa_smp2p.c | 335 +++ drivers/net/ipa/ipa_smp2p.h | 48 + drivers/net/ipa/ipa_table.c | 700 ++++++ drivers/net/ipa/ipa_table.h | 103 + drivers/net/ipa/ipa_uc.c | 211 ++ drivers/net/ipa/ipa_uc.h | 32 + drivers/net/ipa/ipa_version.h | 23 + drivers/remoteproc/Kconfig | 6 + drivers/remoteproc/Makefile | 1 + drivers/remoteproc/qcom_q6v5_ipa_notify.c | 85 + drivers/remoteproc/qcom_q6v5_mss.c | 38 + .../linux/remoteproc/qcom_q6v5_ipa_notify.h | 82 + 50 files changed, 14192 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/qcom,ipa.yaml create mode 100644 drivers/net/ipa/Kconfig create mode 100644 drivers/net/ipa/Makefile create mode 100644 drivers/net/ipa/gsi.c create mode 100644 drivers/net/ipa/gsi.h create mode 100644 drivers/net/ipa/gsi_private.h create mode 100644 drivers/net/ipa/gsi_reg.h create mode 100644 drivers/net/ipa/gsi_trans.c create mode 100644 drivers/net/ipa/gsi_trans.h create mode 100644 drivers/net/ipa/ipa.h create mode 100644 drivers/net/ipa/ipa_clock.c create mode 100644 drivers/net/ipa/ipa_clock.h create mode 100644 drivers/net/ipa/ipa_cmd.c create mode 100644 drivers/net/ipa/ipa_cmd.h create mode 100644 drivers/net/ipa/ipa_data-sc7180.c create mode 100644 drivers/net/ipa/ipa_data-sdm845.c create mode 100644 drivers/net/ipa/ipa_data.h create mode 100644 drivers/net/ipa/ipa_endpoint.c create mode 100644 drivers/net/ipa/ipa_endpoint.h create mode 100644 drivers/net/ipa/ipa_gsi.c create mode 100644 drivers/net/ipa/ipa_gsi.h create mode 100644 drivers/net/ipa/ipa_interrupt.c create mode 100644 drivers/net/ipa/ipa_interrupt.h create mode 100644 drivers/net/ipa/ipa_main.c create mode 100644 drivers/net/ipa/ipa_mem.c create mode 100644 drivers/net/ipa/ipa_mem.h create mode 100644 drivers/net/ipa/ipa_modem.c create mode 100644 drivers/net/ipa/ipa_modem.h create mode 100644 drivers/net/ipa/ipa_qmi.c create mode 100644 drivers/net/ipa/ipa_qmi.h create mode 100644 drivers/net/ipa/ipa_qmi_msg.c create mode 100644 drivers/net/ipa/ipa_qmi_msg.h create mode 100644 drivers/net/ipa/ipa_reg.c create mode 100644 drivers/net/ipa/ipa_reg.h create mode 100644 drivers/net/ipa/ipa_smp2p.c create mode 100644 drivers/net/ipa/ipa_smp2p.h create mode 100644 drivers/net/ipa/ipa_table.c create mode 100644 drivers/net/ipa/ipa_table.h create mode 100644 drivers/net/ipa/ipa_uc.c create mode 100644 drivers/net/ipa/ipa_uc.h create mode 100644 drivers/net/ipa/ipa_version.h create mode 100644 drivers/remoteproc/qcom_q6v5_ipa_notify.c create mode 100644 include/linux/remoteproc/qcom_q6v5_ipa_notify.h