Commit a9c3d39b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'qca_spi-improvements' 

Stefan Wahren says:

====================
qca_spi: collection of improvements

This series contains a wild collection of improvements for the
qca_spi driver. This is a follow-up series to the recent bugfixes [1].

Patch 1, 2 & 3 in this series is the initially intended rework of
netdev_open/close. Patch 4 & 10 are minor functional improvements and
the rest is clean-up.

Changes in V4:
- keep thread handling in netdev_open, but improve this by two
  separate patches ( 1 & 2 )
- add missing link to bugfix series

Changes in V3:
- rebase on net-next-20240124
- improve commit message in Patch 8
- add Reviewed-by's from Jacob Keller
- add Patch 13 for mailmap as suggested by Jacob
- add Patch 14 for MAINTAINERS entry

Changes in V2:
- rebase on net-next-20231218
- improve cover letter

[1] - https://lore.kernel.org/netdev/20231206141222.52029-1-wahrenst@gmx.net/


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e746094b 23b8a64b

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -568,6 +568,7 @@ Simon Kelley <simon@thekelleys.org.uk> 
Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>

Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>

Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>

Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>

Stephen Hemminger <stephen@networkplumber.org> <shemminger@osdl.org>

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -18014,6 +18014,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git 
F:	Documentation/devicetree/bindings/net/wireless/qca,ath9k.yaml

F:	drivers/net/wireless/ath/ath9k/









QUALCOMM ATHEROS QCA7K ETHERNET DRIVER









M:	Stefan Wahren <wahrenst@gmx.net>









L:	netdev@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/net/qca,qca7000.txt









F:	drivers/net/ethernet/qualcomm/qca*

















QUALCOMM BAM-DMUX WWAN NETWORK DRIVER









M:	Stephan Gerhold <stephan@gerhold.net>









L:	netdev@vger.kernel.org

























drivers/net/ethernet/qualcomm/qca_7k.c



+1
−16






























Original line number
Diff line number
Diff line









// SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause









/*









 *









 *   Copyright (c) 2011, 2012, Qualcomm Atheros Communications Inc.









 *   Copyright (c) 2014, I2SE GmbH









 *









 *   Permission to use, copy, modify, and/or distribute this software









 *   for any purpose with or without fee is hereby granted, provided









 *   that the above copyright notice and this permission notice appear









 *   in all copies.









 *









 *   THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL









 *   WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED









 *   WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL









 *   THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR









 *   CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM









 *   LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,









 *   NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN









 *   CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.









 *









 */



















/*   This module implements the Qualcomm Atheros SPI protocol for
































drivers/net/ethernet/qualcomm/qca_7k.h



+1
−15






























Original line number
Diff line number
Diff line









/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */









/*









 *   Copyright (c) 2011, 2012, Qualcomm Atheros Communications Inc.









 *   Copyright (c) 2014, I2SE GmbH









 *









 *   Permission to use, copy, modify, and/or distribute this software









 *   for any purpose with or without fee is hereby granted, provided









 *   that the above copyright notice and this permission notice appear









 *   in all copies.









 *









 *   THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL









 *   WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED









 *   WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL









 *   THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR









 *   CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM









 *   LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,









 *   NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN









 *   CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.









 *









 */



















/*   Qualcomm Atheros SPI register definition.
































drivers/net/ethernet/qualcomm/qca_7k_common.c



+2
−15






























Original line number
Diff line number
Diff line









// SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause









/*









 *   Copyright (c) 2011, 2012, Atheros Communications Inc.









 *   Copyright (c) 2014, I2SE GmbH









 *









 *   Permission to use, copy, modify, and/or distribute this software









 *   for any purpose with or without fee is hereby granted, provided









 *   that the above copyright notice and this permission notice appear









 *   in all copies.









 *









 *   THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL









 *   WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED









 *   WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL









 *   THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR









 *   CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM









 *   LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,









 *   NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN









 *   CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.









 */



















/*   Atheros ethernet framing. Every Ethernet frame is surrounded








@@ -162,5 +149,5 @@ EXPORT_SYMBOL_GPL(qcafrm_fsm_decode);

















MODULE_DESCRIPTION("Qualcomm Atheros QCA7000 common");









MODULE_AUTHOR("Qualcomm Atheros Communications");









MODULE_AUTHOR("Stefan Wahren <stefan.wahren@i2se.com>");









MODULE_AUTHOR("Stefan Wahren <wahrenst@gmx.net>");









MODULE_LICENSE("Dual BSD/GPL");