From owner-svn-src-head@freebsd.org Thu Nov 7 23:36:11 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E387B17E4DA; Thu, 7 Nov 2019 23:36:11 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 478KXq5mqXz4XjH; Thu, 7 Nov 2019 23:36:11 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A97B31D733; Thu, 7 Nov 2019 23:36:11 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA7NaBP5073962; Thu, 7 Nov 2019 23:36:11 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA7NaBbd073959; Thu, 7 Nov 2019 23:36:11 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201911072336.xA7NaBbd073959@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 7 Nov 2019 23:36:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r354505 - head/sys/dev/iwm X-SVN-Group: head X-SVN-Commit-Author: markj X-SVN-Commit-Paths: head/sys/dev/iwm X-SVN-Commit-Revision: 354505 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Nov 2019 23:36:12 -0000 Author: markj Date: Thu Nov 7 23:36:10 2019 New Revision: 354505 URL: https://svnweb.freebsd.org/changeset/base/354505 Log: iwm: Define the mqrx_supported capability. The firmware for 9000-series and newer devices has a different receive API which supports multiple queues. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/iwm/if_iwm_9000.c head/sys/dev/iwm/if_iwm_9260.c head/sys/dev/iwm/if_iwm_config.h Modified: head/sys/dev/iwm/if_iwm_9000.c ============================================================================== --- head/sys/dev/iwm/if_iwm_9000.c Thu Nov 7 23:35:54 2019 (r354504) +++ head/sys/dev/iwm/if_iwm_9000.c Thu Nov 7 23:36:10 2019 (r354505) @@ -92,4 +92,6 @@ const struct iwm_cfg iwm9560_cfg = { .fw_name = IWM9000_FW, IWM_DEVICE_9000_COMMON, .host_interrupt_operation_mode = 0, + .mqrx_supported = 1, + .integrated = 1, }; Modified: head/sys/dev/iwm/if_iwm_9260.c ============================================================================== --- head/sys/dev/iwm/if_iwm_9260.c Thu Nov 7 23:35:54 2019 (r354504) +++ head/sys/dev/iwm/if_iwm_9260.c Thu Nov 7 23:36:10 2019 (r354505) @@ -92,4 +92,5 @@ const struct iwm_cfg iwm9260_cfg = { .fw_name = IWM9260_FW, IWM_DEVICE_9260_COMMON, .host_interrupt_operation_mode = 0, + .mqrx_supported = 1, }; Modified: head/sys/dev/iwm/if_iwm_config.h ============================================================================== --- head/sys/dev/iwm/if_iwm_config.h Thu Nov 7 23:35:54 2019 (r354504) +++ head/sys/dev/iwm/if_iwm_config.h Thu Nov 7 23:36:10 2019 (r354505) @@ -131,13 +131,15 @@ enum iwm_nvm_type { */ struct iwm_cfg { const char *name; - const char *fw_name; - uint16_t eeprom_size; - enum iwm_device_family device_family; - int host_interrupt_operation_mode; - uint8_t nvm_hw_section_num; - int apmg_wake_up_wa; - enum iwm_nvm_type nvm_type; + const char *fw_name; + uint16_t eeprom_size; + enum iwm_device_family device_family; + int host_interrupt_operation_mode; + int mqrx_supported; + int integrated; + uint8_t nvm_hw_section_num; + int apmg_wake_up_wa; + enum iwm_nvm_type nvm_type; }; /*