Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 22339b74 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.12.r1-15100-SMxx50.QSSI13.0' of... 

Merge tag 'LA.UM.9.12.r1-15100-SMxx50.QSSI13.0' of https://git.codelinaro.org/clo/la/kernel/msm-4.19 into android13-4.19-kona

"LA.UM.9.12.r1-15100-SMxx50.QSSI13.0"

* tag 'LA.UM.9.12.r1-15100-SMxx50.QSSI13.0' of https://git.codelinaro.org/clo/la/kernel/msm-4.19:
  net: usb: Upgrade ax88179a driver
  msm: cvp: Resuming DSP if power collapse fails
  include: v4l2-controls: Inclusion of layered intra-refresh
  serial: msm_geni_serial: Extend packing configurations
  wifi: cfg80211: fix BSS refcounting bugs
  wifi: cfg80211: fix u8 overflow in cfg80211_update_notlisted_nontrans()
  wifi: cfg80211: avoid nontransmitted BSS list corruption
  qcedev: check num_fds during unmap
  msm: ipa: remove initing head again if dma mapping fails
  msm: ipa: add skb recycle if dma fails during replenish
  Added milestone call for QRKS

 Conflicts:
	drivers/net/usb/ax88179_178a.c

Change-Id: I72fe12fc095af2a88b0a064662c1496d2b66ac68
parents 1a5b6a47 94edede0

drivers/crypto/msm/qcedev.c

+9 −1
Original line number Diff line number Diff line
@@ -2036,7 +2036,9 @@ static inline long qcedev_ioctl(struct file *file, 
				goto exit_free_qcedev_areq;

			}



			if (map_buf.num_fds > QCEDEV_MAX_BUFFERS) {

			if (map_buf.num_fds > ARRAY_SIZE(map_buf.fd)) {

				pr_err("%s: err: num_fds = %d exceeds max value\n",

				__func__, map_buf.num_fds);

				err = -EINVAL;

				goto exit_free_qcedev_areq;

			}
@@ -2076,6 +2078,12 @@ static inline long qcedev_ioctl(struct file *file, 
				err = -EFAULT;

				goto exit_free_qcedev_areq;

			}

			if (unmap_buf.num_fds > ARRAY_SIZE(unmap_buf.fd)) {

				pr_err("%s: err: num_fds = %d exceeds max value\n",

				__func__, unmap_buf.num_fds);

				err = -EINVAL;

				goto exit_free_qcedev_areq;

			}



			for (i = 0; i < unmap_buf.num_fds; i++) {

				err = qcedev_check_and_unmap_buffer(handle,

drivers/media/platform/msm/cvp/cvp_hfi.c

+1 −0
Original line number Diff line number Diff line
@@ -2931,6 +2931,7 @@ static int __power_collapse(struct iris_hfi_device *device, bool force) 
	dprintk(CVP_WARN, "Skip PC(%#x, %#x, %#x)\n",

		wfi_status, idle_status, pc_ready);

	__flush_debug_queue(device, device->raw_packet);

	__dsp_resume(device, 0);

	return -EAGAIN;

}

drivers/net/usb/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ obj-$(CONFIG_USB_HSO) += hso.o 
obj-$(CONFIG_USB_LAN78XX)	+= lan78xx.o

obj-$(CONFIG_USB_NET_AX8817X)	+= asix.o

asix-y := asix_devices.o asix_common.o ax88172a.o

obj-$(CONFIG_USB_NET_AX88179_178A)      += ax88179_178a.o

obj-$(CONFIG_USB_NET_AX88179_178A)      += ax_usb_nic.o

ax_usb_nic-y := ax_main.o ax88179_178a.o ax88179a_772d.o

obj-$(CONFIG_USB_NET_CDCETHER)	+= cdc_ether.o

obj-$(CONFIG_USB_NET_CDC_EEM)	+= cdc_eem.o

obj-$(CONFIG_USB_NET_DM9601)	+= dm9601.o

drivers/net/usb/ax88179_178a.c

+710 −1649

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/usb/ax88179_178a.h

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*******************************************************************************

 *     Copyright (c) 2022    ASIX Electronic Corporation    All rights reserved.

 *

 * This program is free software: you can redistribute it and/or modify it under

 * the terms of the GNU General Public License as published by the Free Software

 * Foundation, either version 2 of the License, or (at your option) any later

 * version.

 *

 * This program is distributed in the hope that it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS

 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details

 *

 * You should have received a copy of the GNU General Public License along with

 * this program. If not, see <https://www.gnu.org/licenses/>.

 ******************************************************************************/

#ifndef __ASIX_AX88179_178A_H

#define __ASIX_AX88179_178A_H



#define AX88179_NAPI_WEIGHT		64

#define AX88179_BUF_RX_SIZE		(48 * 1024)

#define AX88179_PHY_ID			0x03



extern const struct net_device_ops ax88179_netdev_ops;

#if KERNEL_VERSION(5, 15, 0) <= LINUX_VERSION_CODE

int ax88179_siocdevprivate(struct net_device *netdev, struct ifreq *rq,

			   void __user *udata, int cmd);

#endif

int ax88179_ioctl(struct net_device *net, struct ifreq *rq, int cmd);



int ax88179_set_mac_addr(struct net_device *net, void *p);

void ax88179_set_multicast(struct net_device *net);



extern const struct driver_info ax88179_info;

#endif