mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
TI SoC driver updates for v7.4
Small cleanup-only pull request for drivers/firmware and drivers/soc/ti. It contains no functional changes to SoC behavior and no new features Firmware: - ti_sci: Simplify the buffer pointer allocation by using kzalloc() in place of kcalloc() - ti_sci: Fix a typo in comments SoC drivers: - k3-ringacc: Correct the ring API kernel-doc and the DMA ring initialization kernel-doc so the documentation matches the code - knav_qmss: Fix typos in comments -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE+KKGk1TrgjIXoxo03bWEnRc2JJ0FAmrDliQACgkQ3bWEnRc2 JJ2+rg/9Grj14Z01J17ClvO9IYaN0Vkgc/4Qyu+GjruKN7hsY89Kw8t+tDXjR+Y1 xr1NX7wzqZPl5E7MjsBUpunH+oeQlWuBxLzhqMSWqZGv+K/KhZPLw/9wsJMEpoxX Gk49ye/y+RESqs+TykfVDr8o1+F/IjycrppBdjgqZcLXCsTcKMVMz/XByrgut41H Ci6omPYBhgvh3Ru+/FJkBD4D5vw8aBbDb29X/8kMRvGC/ukhbCWtxAUk6iGjfSP8 04bRb7zveBqAdBo4MulFV3GLE/zjdDAgB1GhDACJP7axk7RGCtpP/mzZW4+mGXfo FCbdQPO5dF3pVmmb/02+3Xw6jgzocWSJIdnnypAuJXpJ9J7WNQrmS0GaLVKey0fL 55x1aNKajVraSI9piI0F0QSx0bddaEsOXeLQ2+/lOC1bQYRnAjJ37c1hfxwgXETx JYK0vNAO4paqKfUiRI/Kpn8NQYNTZXwP/7a5FOT8qfRCoRrVcyGPqXS/cMggyLT8 UhxMSpnyeEB87AxRrJ9C9CEo9h4ELMqxCiTYGj9wSdFR+GClIRgh6ruhTUDXA0GC nbisz5htJIWX5+4Y+4B26hxfjdU9Z3cozcRVwUL1j+TetlDjqFjNM5tlAzmgE5j9 9b/OjDl/qq9u4x5mAe0hyQc/6yzYNfwHSEH2+/cpZH7u+OCDgH8= =ugk4 -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmrOQPIACgkQmmx57+YA GNluBQ//SoLQ4EUewZwJaWamL1UaqSIya8GR+JUY3vIxaFIRT43/ORHFhNJ6Mx9d eAFhfY58UfWbtr7SR+kNsjzJGZ4oLozD4/r/B1iIdgLxtQpdffp+fdLNz7ukcylj z/lYngOLMKw28zc8NF46/7sPsnqgr6ZFJyYHU0LVtN59ySnzxUvezAgPYgcImsRf pEuAoKqHQbFCg7ylN1yTqQFbHQcf62qDG2hlsCxIobDQsUnO+vbyP1EmPVVXyIsb OuQ360pgNhiKIE3g5IAIG9UNzfhAncdBMl5mnyf/u6IRPov0InRa5hmTRWLA+f+O BxYDpdI1OTS45AtjTAsuZqJtGmdSYsqYiqWb2pIy+J4iNss+QJaZEiL4tfmoyMIp oMHYZsFuRzNRYt6nU/cKHJDCtJm4KTiiw0bloqv6xEg7mUicdEB0KZvJXgtAEnv/ VMXRobSbhv0LJVHP0+6G5NT50iTU9zTNfyCpZc877UQd2eFk6AI0WixMsm6DbQ9n znbWxc8SXcEEjTiatXPscBNXqRVo1NdCeFosS+t218deCtPB7eRIkYB/bZhTdGly +BfhZxj0OEcaAxTG1NvpXo6B7TurLYqw1fs7lDI+sLLFUHeEUoYMp/WsE1qTmJLh XRjpvNhDseT2p8/4OtCahpgRoYVxqeeh/y+Sw7j4rkH1sbjBc60= =3CoZ -----END PGP SIGNATURE----- Merge tag 'ti-driver-soc-for-v7.4' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/drivers TI SoC driver updates for v7.4 Small cleanup-only pull request for drivers/firmware and drivers/soc/ti. It contains no functional changes to SoC behavior and no new features Firmware: - ti_sci: Simplify the buffer pointer allocation by using kzalloc() in place of kcalloc() - ti_sci: Fix a typo in comments SoC drivers: - k3-ringacc: Correct the ring API kernel-doc and the DMA ring initialization kernel-doc so the documentation matches the code - knav_qmss: Fix typos in comments * tag 'ti-driver-soc-for-v7.4' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: soc: ti: k3-ringacc: Fix DMA ring initialization kernel-doc soc: ti: k3-ringacc: Correct ring API kernel-doc firmware: ti_sci: replace kcalloc with kzalloc for buffer pointer allocation soc: ti: knav_qmss: Fix typos in comments firmware: ti_sci: Fix typo "upto" in comments Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
commit
978a1e99a5
|
|
@ -4050,7 +4050,7 @@ static const struct ti_sci_desc ti_sci_pmmc_k2g_desc = {
|
|||
.default_host_id = 2,
|
||||
/* Conservative duration */
|
||||
.max_rx_timeout_ms = 1000,
|
||||
/* Limited by MBOX_TX_QUEUE_LEN. K2G can handle upto 128 messages! */
|
||||
/* Limited by MBOX_TX_QUEUE_LEN. K2G can handle up to 128 messages! */
|
||||
.max_msgs = 20,
|
||||
.max_msg_size = 64,
|
||||
};
|
||||
|
|
@ -4060,7 +4060,7 @@ static const struct ti_sci_desc ti_sci_pmmc_am654_desc = {
|
|||
.default_host_id = 12,
|
||||
/* Conservative duration */
|
||||
.max_rx_timeout_ms = 10000,
|
||||
/* Limited by MBOX_TX_QUEUE_LEN. K2G can handle upto 128 messages! */
|
||||
/* Limited by MBOX_TX_QUEUE_LEN. K2G can handle up to 128 messages! */
|
||||
.max_msgs = 20,
|
||||
.max_msg_size = 60,
|
||||
};
|
||||
|
|
@ -4132,7 +4132,7 @@ static int ti_sci_probe(struct platform_device *pdev)
|
|||
|
||||
/* Pre-initialize the buffer pointer to pre-allocated buffers */
|
||||
for (i = 0, xfer = minfo->xfer_block; i < desc->max_msgs; i++, xfer++) {
|
||||
xfer->xfer_buf = devm_kcalloc(dev, 1, desc->max_msg_size,
|
||||
xfer->xfer_buf = devm_kzalloc(dev, desc->max_msg_size,
|
||||
GFP_KERNEL);
|
||||
if (!xfer->xfer_buf)
|
||||
return -ENOMEM;
|
||||
|
|
|
|||
|
|
@ -509,7 +509,7 @@ static int knav_queue_flush(struct knav_queue *qh)
|
|||
/**
|
||||
* knav_queue_open() - open a hardware queue
|
||||
* @name: - name to give the queue handle
|
||||
* @id: - desired queue number if any or specifes the type
|
||||
* @id: - desired queue number if any or specifies the type
|
||||
* of queue
|
||||
* @flags: - the following flags are applicable to queues:
|
||||
* KNAV_QUEUE_SHARED - allow the queue to be shared. Queues are
|
||||
|
|
@ -805,7 +805,7 @@ void *knav_pool_create(const char *name,
|
|||
}
|
||||
|
||||
/* Region maintains a sorted (by region offset) list of pools
|
||||
* use the first free slot which is large enough to accomodate
|
||||
* use the first free slot which is large enough to accommodate
|
||||
* the request
|
||||
*/
|
||||
last_offset = 0;
|
||||
|
|
|
|||
|
|
@ -57,13 +57,13 @@ struct k3_ringacc;
|
|||
struct k3_ring;
|
||||
|
||||
/**
|
||||
* enum k3_ring_cfg - RA ring configuration structure
|
||||
* struct k3_ring_cfg - RA ring configuration structure
|
||||
*
|
||||
* @size: Ring size, number of elements
|
||||
* @elm_size: Ring element size
|
||||
* @mode: Ring operational mode
|
||||
* @flags: Ring configuration flags. Possible values:
|
||||
* @K3_RINGACC_RING_SHARED: when set allows to request the same ring
|
||||
* %K3_RINGACC_RING_SHARED: when set allows to request the same ring
|
||||
* few times. It's usable when the same ring is used as Free Host PD ring
|
||||
* for different flows, for example.
|
||||
* Note: Locking should be done by consumer if required
|
||||
|
|
@ -88,11 +88,10 @@ struct k3_ring_cfg {
|
|||
/**
|
||||
* of_k3_ringacc_get_by_phandle - find a RA by phandle property
|
||||
* @np: device node
|
||||
* @propname: property name containing phandle on RA node
|
||||
* @property: property name containing phandle on RA node
|
||||
*
|
||||
* Returns pointer on the RA - struct k3_ringacc
|
||||
* or -ENODEV if not found,
|
||||
* or -EPROBE_DEFER if not yet registered
|
||||
* Return: Pointer to the RA, or ERR_PTR(-ENODEV) if the phandle cannot
|
||||
* be resolved, or ERR_PTR(-EPROBE_DEFER) if the RA is not yet registered.
|
||||
*/
|
||||
struct k3_ringacc *of_k3_ringacc_get_by_phandle(struct device_node *np,
|
||||
const char *property);
|
||||
|
|
@ -103,10 +102,8 @@ struct k3_ringacc *of_k3_ringacc_get_by_phandle(struct device_node *np,
|
|||
* k3_ringacc_request_ring - request ring from ringacc
|
||||
* @ringacc: pointer on ringacc
|
||||
* @id: ring id or K3_RINGACC_RING_ID_ANY for any general purpose ring
|
||||
* @flags:
|
||||
* @K3_RINGACC_RING_USE_PROXY: if set - proxy will be allocated and
|
||||
* used to access ring memory. Sopported only for rings in
|
||||
* Message/Credentials/Queue mode.
|
||||
* @flags: Set %K3_RINGACC_RING_USE_PROXY to allocate a proxy for
|
||||
* accessing ring memory in Message mode.
|
||||
*
|
||||
* Returns pointer on the Ring - struct k3_ring
|
||||
* or NULL in case of failure.
|
||||
|
|
@ -126,8 +123,9 @@ int k3_ringacc_request_rings_pair(struct k3_ringacc *ringacc,
|
|||
*/
|
||||
void k3_ringacc_ring_reset(struct k3_ring *ring);
|
||||
/**
|
||||
* k3_ringacc_ring_reset - ring reset for DMA rings
|
||||
* k3_ringacc_ring_reset_dma - ring reset for DMA rings
|
||||
* @ring: pointer on Ring
|
||||
* @occ: occupancy used by the DMA reset quirk, or zero to read it from hardware
|
||||
*
|
||||
* Resets ring internal state ((hw)occ, (hw)idx). Should be used for rings
|
||||
* which are read by K3 UDMA, like TX or Free Host PD rings.
|
||||
|
|
@ -217,8 +215,8 @@ int k3_ringacc_ring_push(struct k3_ring *ring, void *elem);
|
|||
* @ring: pointer on ring
|
||||
* @elem: pointer on ring element buffer
|
||||
*
|
||||
* Push one ring element from the ring head. Size of the ring element is
|
||||
* determined by ring configuration &struct k3_ring_cfg elm_size..
|
||||
* Pop one ring element from the ring head. Size of the ring element is
|
||||
* determined by ring configuration &struct k3_ring_cfg elm_size.
|
||||
*
|
||||
* Returns 0 on success, errno otherwise.
|
||||
*/
|
||||
|
|
@ -242,7 +240,7 @@ int k3_ringacc_ring_push_head(struct k3_ring *ring, void *elem);
|
|||
* @ring: pointer on ring
|
||||
* @elem: pointer on ring element buffer
|
||||
*
|
||||
* Push one ring element from the ring tail. Size of the ring element is
|
||||
* Pop one ring element from the ring tail. Size of the ring element is
|
||||
* determined by ring configuration &struct k3_ring_cfg elm_size.
|
||||
*
|
||||
* Returns 0 on success, errno otherwise.
|
||||
|
|
@ -256,7 +254,10 @@ u32 k3_ringacc_get_tisci_dev_id(struct k3_ring *ring);
|
|||
struct ti_sci_handle;
|
||||
|
||||
/**
|
||||
* struct struct k3_ringacc_init_data - Initialization data for DMA rings
|
||||
* struct k3_ringacc_init_data - Initialization data for DMA rings
|
||||
* @tisci: TI SCI firmware handle
|
||||
* @tisci_dev_id: TI SCI device ID of the DMA controller
|
||||
* @num_rings: Total number of available rings
|
||||
*/
|
||||
struct k3_ringacc_init_data {
|
||||
const struct ti_sci_handle *tisci;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user