[PATCH linux-firmware 00/12] Fix metadata for linux-firmware

[PATCH linux-firmware 00/12] Fix metadata for linux-firmware

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 1587 bytes --]

This series adds a metadata consistency check script, fixes all the
errors it found, and adds a reference to it in README.

If I don't hear any objections, I'll apply these changes next week.

Ben.

Ben Hutchings (12):
  Add a metadata consistency check script
  WHENCE: Correct filename of LICENCE.moxa
  Add copy of GPL v2 and references to the GPL-2 and GPL-3 files
  WHENCE: Specify source directories for cis, isci, and usbdux firmware
  WHENCE: Remove references to source for emi62 firmware
  WHENCE: Remove references to two nvidia firmware files that were never
    added
  Remove unused 'LICENCE.mwl8335'
  WHENCE: Adjust some licence file references to satisfy check_whence.py
  WHENCE: Fix metadata for snd-soc-skl firmware
  WHENCE: List new radeon CI and SI smc firmware
  WHENCE: Add reference to 'qca/NOTICE.txt'
  README: Say that files must be listed in WHENCE, and how to check it

 GPL-2           | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 LICENCE.mwl8335 |  52 ---------
 Makefile        |   3 +
 README          |   9 +-
 WHENCE          |  89 ++++++++-------
 check_whence.py |  56 ++++++++++
 6 files changed, 453 insertions(+), 95 deletions(-)
 create mode 100644 GPL-2
 delete mode 100644 LICENCE.mwl8335
 create mode 100755 check_whence.py

-- 
Ben Hutchings
Klipstein's 4th Law of Prototyping and Production:
                                    A fail-safe circuit will destroy
others.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

[PATCH linux-firmware 01/12] Add a metadata consistency check script

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 3035 bytes --]

The script compares the files listed in WHENCE (or otherwise expected)
and the files known to git, and reports all differences as errors.

Add a 'check' rule to the Makefile that runs this.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 Makefile        |  3 +++
 check_whence.py | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100755 check_whence.py

diff --git a/Makefile b/Makefile
index 1b1aa2836c97..d1163b871096 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,9 @@ FIRMWAREDIR = /lib/firmware
 
 all:
 
+check:
+	./check_whence.py
+
 install:
 	mkdir -p $(DESTDIR)$(FIRMWAREDIR)
 	cp -r * $(DESTDIR)$(FIRMWAREDIR)
diff --git a/check_whence.py b/check_whence.py
new file mode 100755
index 000000000000..f83fb197aa57
--- /dev/null
+++ b/check_whence.py
@@ -0,0 +1,56 @@
+#!/usr/bin/python
+
+import os, re, sys
+
+def list_whence():
+    with open('WHENCE') as whence:
+        for line in whence:
+            match = re.match(r'(?:File|Link|Source):\s*(\S*)', line)
+            if match:
+                yield match.group(1)
+                continue
+            match = re.match(r'Licen[cs]e: (?:.*\bSee (.*) for details\.?|(\S*))\n',
+                             line)
+            if match:
+                if match.group(1):
+                    for name in re.split(r', | and ', match.group(1)):
+                        yield name
+                    continue
+                if match.group(2):
+                    # Just one word - may or may not be a filename
+                    if not re.search(r'unknown|distributable', match.group(2),
+                                     re.IGNORECASE):
+                        yield match.group(2)
+                        continue
+
+def list_git():
+    with os.popen('git ls-files') as git_files:
+        for line in git_files:
+            yield line.rstrip('\n')
+
+def main():
+    whence_list = list(list_whence())
+    known_files = set(name for name in whence_list if not name.endswith('/')) | \
+                  set(['check_whence.py', 'configure', 'Makefile',
+                       'README', 'WHENCE'])
+    known_prefixes = set(name for name in whence_list if name.endswith('/'))
+    git_files = set(list_git())
+
+    for name in sorted(list(known_files - git_files)):
+        sys.stderr.write('E: %s listed in WHENCE does not exist\n' % name)
+
+    for name in sorted(list(git_files - known_files)):
+        # Ignore subdirectory changelogs and GPG detached signatures
+        if (name.endswith('/ChangeLog') or
+            (name.endswith('.asc') and name[:-4] in known_files)):
+            continue
+
+        # Ignore unknown files in known directories
+        for prefix in known_prefixes:
+            if name.startswith(prefix):
+                break
+        else:
+            sys.stderr.write('E: %s not listed in WHENCE\n' % name)
+
+if __name__ == '__main__':
+    main()


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

[PATCH linux-firmware 02/12] WHENCE: Correct filename of LICENCE.moxa

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 826 bytes --]

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 WHENCE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WHENCE b/WHENCE
index d7feede2b4da..5abdd8d3f49f 100644
--- a/WHENCE
+++ b/WHENCE
@@ -2889,7 +2889,7 @@ File: moxa/moxa-1131.fw
 File: moxa/moxa-1150.fw
 File: moxa/moxa-1151.fw
 
-License: Redistributable. See LICENSE.moxa for details
+License: Redistributable. See LICENCE.moxa for details
 
 --------------------------------------------------------------------------
 
@@ -2905,7 +2905,7 @@ File: moxa/moxa-1618.fw
 File: moxa/moxa-1653.fw
 File: moxa/moxa-1658.fw
 
-License: Redistributable. See LICENSE.moxa for details
+License: Redistributable. See LICENCE.moxa for details
 
 --------------------------------------------------------------------------
 


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

[PATCH linux-firmware 03/12] Add copy of GPL v2 and references to the GPL-2 and GPL-3 files

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 21430 bytes --]

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 GPL-2  | 339 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 WHENCE |  16 ++--
 2 files changed, 347 insertions(+), 8 deletions(-)
 create mode 100644 GPL-2

diff --git a/GPL-2 b/GPL-2
new file mode 100644
index 000000000000..d159169d1050
--- /dev/null
+++ b/GPL-2
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/WHENCE b/WHENCE
index 5abdd8d3f49f..6ca42394eeb7 100644
--- a/WHENCE
+++ b/WHENCE
@@ -172,7 +172,7 @@ Source: keyspan_pda/xircom_pgs.S
 
 Source: keyspan_pda/Makefile
 
-Licence: GPLv2+
+Licence: GPLv2 or later. See GPL-2 and GPL-3 for details.
 
 Compiled from original 8051 source into Intel HEX, used in our binary ihex form.
 
@@ -389,7 +389,7 @@ Source: dsp56k/bootstrap.asm
 Source: dsp56k/Makefile
 Source: dsp56k/concat-bootstrap.pl
 
-Licence: GPLv2 or later
+Licence: GPLv2 or later. See GPL-2 and GPL-3 for details.
 
 DSP56001 assembler, buildable with a56 from
 http://www.zdomain.com/a56.html
@@ -1137,7 +1137,7 @@ File: cis/SW_555_SER.cis
 File: cis/SW_7xx_SER.cis
 File: cis/SW_8xx_SER.cis
 
-Licence: GPLv3
+Licence: GPLv3. See GPL-3 for details.
 
 Copyright Sierra Wireless
 
@@ -1349,7 +1349,7 @@ File: av7110/bootcode.bin
 Source: av7110/Boot.S
 Source: av7110/Makefile
 
-Licence: GPLv2 or later
+Licence: GPLv2 or later. See GPL-2 and GPL-3 for details.
 
 ARM assembly source code from https://linuxtv.org/downloads/firmware/Boot.S
 
@@ -1455,7 +1455,7 @@ Source: usbdux/usbduxfast_firmware.asm
 Source: usbdux/usbdux_firmware.asm
 Source: usbdux/usbduxsigma_firmware.asm
 
-Licence: GPLv2. See source code in usbdux/ subdirectory.
+Licence: GPLv2. See GPL-2 for details.
 
 Provided from the author, Bernd Porr <BerndPorr@f2s.com>
 
@@ -2709,7 +2709,7 @@ Source: isci/create_fw.h
 Source: isci/probe_roms.h
 Source: isci/Makefile
 
-Licence: GPLv2
+Licence: GPLv2. See GPL-2 for details.
 
 --------------------------------------------------------------------------
 
@@ -2750,7 +2750,7 @@ Source: carl9170fw/
 
 Downloaded from http://linuxwireless.org/en/users/Drivers/carl9170
 
-Licence: GPLv2. Some build scripts use the New BSD (3-clause) licence.
+Licence: GPLv2. Some build scripts use the New BSD (3-clause) licence.. See GPL-2 for details.
 
 --------------------------------------------------------------------------
 
@@ -3114,7 +3114,7 @@ File: atusb/atusb-0.2.dfu
 Version: 0.2
 Info: atusb/ChangeLog
 
-Licence: GPLv2+
+Licence: GPLv2 or later. See GPL-2 and GPL-3 for details.
 
 --------------------------------------------------------------------------
 


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

[PATCH linux-firmware 04/12] WHENCE: Specify source directories for cis, isci, and usbdux firmware

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 1418 bytes --]

This stops check_whence.py complaining about Makefiles etc.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 WHENCE | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/WHENCE b/WHENCE
index 6ca42394eeb7..372f111c1b01 100644
--- a/WHENCE
+++ b/WHENCE
@@ -1074,13 +1074,7 @@ File: cis/NE2K.cis
 File: cis/tamarack.cis
 File: cis/PE-200.cis
 File: cis/PE520.cis
-Source: cis/src/LA-PCM.cis
-Source: cis/src/PCMLM28.cis
-Source: cis/src/DP83903.cis
-Source: cis/src/NE2K.cis
-Source: cis/src/tamarack.cis
-Source: cis/src/PE-200.cis
-Source: cis/src/PE520.cis
+Source: cis/
 
 Licence: Dual GPLv2/MPL
 
@@ -1450,10 +1444,7 @@ Driver: usbdux/usbduxfast/usbduxsigma - usbdux data acquisition cards
 File: usbdux_firmware.bin
 File: usbduxfast_firmware.bin
 File: usbduxsigma_firmware.bin
-Source: usbdux/fx2-include.asm
-Source: usbdux/usbduxfast_firmware.asm
-Source: usbdux/usbdux_firmware.asm
-Source: usbdux/usbduxsigma_firmware.asm
+Source: usbdux/
 
 Licence: GPLv2. See GPL-2 for details.
 
@@ -2704,10 +2695,7 @@ Licence: Redistributable. See LICENCE.ene_firmware for details.
 Driver: isci -- Intel C600 SAS controller driver
 
 File: isci/isci_firmware.bin
-Source: isci/create_fw.c
-Source: isci/create_fw.h
-Source: isci/probe_roms.h
-Source: isci/Makefile
+Source: isci/
 
 Licence: GPLv2. See GPL-2 for details.
 


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

[PATCH linux-firmware 05/12] WHENCE: Remove references to source for emi62 firmware

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 703 bytes --]

The 'sources' appear to be the names of ihex files, not actual source
code, and in any case those files are not included in this repository.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 WHENCE | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/WHENCE b/WHENCE
index 372f111c1b01..60028347b443 100644
--- a/WHENCE
+++ b/WHENCE
@@ -221,17 +221,14 @@ Version: 1.0.0.191
 Info: DATE= 2002oct28
 
 File: emi62/loader.fw
-Source: EMILOAD.HEX
 Version: 1.0.2.002
 Info: DATE=10.01.2002
 
 File: emi62/midi.fw
-Source: EMI62MFW.HEX
 Version: 1.04.062
 Info: DATE=16.10.2002
 
 File: emi62/spdif.fw
-Source: EMI62SFW.HEX
 Version: 1.04.062
 Info: DATE=16.10.2002
 


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

[PATCH linux-firmware 06/12] WHENCE: Remove references to two nvidia firmware files that were never added

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 633 bytes --]

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 WHENCE | 2 --
 1 file changed, 2 deletions(-)

diff --git a/WHENCE b/WHENCE
index 60028347b443..93927fcfe627 100644
--- a/WHENCE
+++ b/WHENCE
@@ -3227,10 +3227,8 @@ File: nvidia/gm20b/gr/fecs_bl.bin
 File: nvidia/gm20b/gr/fecs_data.bin
 File: nvidia/gm20b/gr/fecs_inst.bin
 File: nvidia/gm20b/gr/fecs_sig.bin
-File: nvidia/gm20b/gr/gpccs_bl.bin
 File: nvidia/gm20b/gr/gpccs_data.bin
 File: nvidia/gm20b/gr/gpccs_inst.bin
-File: nvidia/gm20b/gr/gpccs_sig.bin
 File: nvidia/gm20b/gr/sw_bundle_init.bin
 File: nvidia/gm20b/gr/sw_ctx.bin
 File: nvidia/gm20b/gr/sw_method_init.bin


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

[PATCH linux-firmware 07/12] Remove unused 'LICENCE.mwl8335'

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 2955 bytes --]

This was the licence text for mwl8335_duplex.fw which has already been
removed.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 LICENCE.mwl8335 | 52 ----------------------------------------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 LICENCE.mwl8335

diff --git a/LICENCE.mwl8335 b/LICENCE.mwl8335
deleted file mode 100644
index 0b824521bfdf..000000000000
--- a/LICENCE.mwl8335
+++ /dev/null
@@ -1,52 +0,0 @@
-FIRMWARE LICENSE TERMS
-
-
-Copyright (c) Marvell International Ltd.
-
-All rights reserved.
-
-Redistribution. Redistribution and use in binary form, without modification, are
-permitted provided that the following conditions are met:
-
-* Redistributions must reproduce the above copyright notice and the following
-disclaimer in the documentation and/or other materials provided with the
-distribution.
-
-* Neither the name of Marvell International Ltd. nor the names of its suppliers
-may be used to endorse or promote products derived from this software without
-specific prior written permission.
-
-* No reverse engineering, decompilation, or disassembly of this software is
-permitted.
-
-Limited patent license. Marvell International Ltd. grants a world-wide,
-royalty-free, non-exclusive license under patents it now or hereafter owns or
-controls to make, have made, use, import, offer to sell and sell ("Utilize")
-this software, but solely to the extent that any such patent is necessary to
-Utilize the software alone, or in combination with an operating system licensed
-under an approved Open Source license as listed by the Open Source Initiative at
-http://opensource.org/licenses. The patent license shall not apply to any other
-combinations which include this software. No hardware per se is licensed
-hereunder.
-
-DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----
-
-NOTE: this firmware was generated from img_cb35_fw_duplex.h contained in the
-GPL source release of the Maxtor Shared Storage II product available here:
-
-http://www.seagate.com/staticfiles/maxtor/en_us/downloads/MSSII_3.1.2.src.tgz
-
-Explicit permission from Marvell was obtained to upload this firmware to the
-linux-firmware git repository under the Marvell firmware license above.
-


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

[PATCH linux-firmware 08/12] WHENCE: Adjust some licence file references to satisfy check_whence.py

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 963 bytes --]

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 WHENCE | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WHENCE b/WHENCE
index 93927fcfe627..17dda3bfb16f 100644
--- a/WHENCE
+++ b/WHENCE
@@ -469,8 +469,7 @@ Version: 1.4.0
 File: ath9k_htc/htc_9271-1.4.0.fw
 Version: 1.4.0
 
-Licence: Redistributable (full source code is available under free
-software licences). See LICENCE.open-ath9k-htc-firmware for details
+Licence: Free software. See LICENCE.open-ath9k-htc-firmware for details
 
 --------------------------------------------------------------------------
 
@@ -2959,7 +2958,8 @@ File: qat_c3xxx_mmp.bin
 File: qat_c62x.bin
 File: qat_c62x_mmp.bin
 
-Licence: Redistributable. See LICENCE.qat_firmware
+Licence: Redistributable. See LICENCE.qat_firmware for details
+
 --------------------------------------------------------------------------
 
 Driver: rsi -- Redpine Signals Inc 91x driver


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

[PATCH linux-firmware 09/12] WHENCE: Fix metadata for snd-soc-skl firmware

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 1828 bytes --]

Fix filename 'intel/dsp_fw_bxtn.bin'.  List all the files and their
versions, not just the symlinks.  Delete the non-standard 'md5sum'
fields.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 WHENCE | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/WHENCE b/WHENCE
index 17dda3bfb16f..df69dd8cbc75 100644
--- a/WHENCE
+++ b/WHENCE
@@ -3041,21 +3041,39 @@ License: Redistributable. See LICENCE.fw_sst_0f28 for details
 
 Driver: snd-soc-skl
 
-File: intel/dsp_fw_release.bin
+File: intel/dsp_fw_release_v827.bin
+Version: 8.20.00.927
+File: intel/dsp_fw_release_v869.bin
+Version; 8.20.00.869
+File: intel/dsp_fw_release_v896.bin
+Version: 8.20.00.896
+File: intel/dsp_fw_release_v927.bin
+Version: 8.20.00.927
+File: intel/dsp_fw_release_v948.bin
+Version: 8.20.00.948
+File: intel/dsp_fw_release_v951.bin
+Version: 8.20.00.951
+File: intel/dsp_fw_release_v958.bin
 Version: 8.20.00.958
-md5sum: 02bd300f5ef85ae04afffd7c0ef50c46
+Link: intel/dsp_fw_release.bin -> dsp_fw_release_v958.bin
 
 License: Redistributable. See LICENCE.adsp_sst for details
 
-File: intel/dsp_fw_bxt.bin
+File: intel/dsp_fw_bxtn_v430.bin
+Version: 9.00.00.430
+File: intel/dsp_fw_bxtn_v702.bin
+Version: 9.00.00.702
+File: intel/dsp_fw_bxtn_v1118.bin
 Version: 9.22.00.1118
-md5sum: 469dfcf5b2ebbc58505a0cca23303723
+Link: intel/dsp_fw_bxtn.bin -> dsp_fw_bxtn_v1118.bin
 
 License: Redistributable. See LICENCE.adsp_sst for details
 
-File: intel/dsp_fw_kbl.bin
+File: intel/dsp_fw_kbl_v701.bin
+Version: 9.21.00.701
+File: intel/dsp_fw_kbl_v1037.bin
 Version: 09.21.00.1037
-md5sum: e71a2421565fadae228b3924d9510bcb
+Link: intel/dsp_fw_kbl.bin -> dsp_fw_kbl_v1037.bin
 
 License: Redistributable. See LICENCE.adsp_sst for details
 


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

[PATCH linux-firmware 10/12] WHENCE: List new radeon CI and SI smc firmware

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 2081 bytes --]

These were added in commits 406964300821, 9693ff6d749d.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 WHENCE | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/WHENCE b/WHENCE
index df69dd8cbc75..64fea97a20dc 100644
--- a/WHENCE
+++ b/WHENCE
@@ -1743,36 +1743,42 @@ File: radeon/MULLINS_pfp.bin
 File: radeon/MULLINS_rlc.bin
 File: radeon/MULLINS_sdma.bin
 File: radeon/pitcairn_ce.bin
+File: radeon/pitcairn_k_smc.bin
 File: radeon/pitcairn_mc.bin
 File: radeon/pitcairn_me.bin
 File: radeon/pitcairn_pfp.bin
 File: radeon/pitcairn_rlc.bin
 File: radeon/pitcairn_smc.bin
 File: radeon/tahiti_ce.bin
+File: radeon/tahiti_k_smc.bin
 File: radeon/tahiti_mc.bin
 File: radeon/tahiti_me.bin
 File: radeon/tahiti_pfp.bin
 File: radeon/tahiti_rlc.bin
 File: radeon/tahiti_smc.bin
 File: radeon/verde_ce.bin
+File: radeon/verde_k_smc.bin
 File: radeon/verde_mc.bin
 File: radeon/verde_me.bin
 File: radeon/verde_pfp.bin
 File: radeon/verde_rlc.bin
 File: radeon/verde_smc.bin
 File: radeon/oland_ce.bin
+File: radeon/oland_k_smc.bin
 File: radeon/oland_mc.bin
 File: radeon/oland_me.bin
 File: radeon/oland_pfp.bin
 File: radeon/oland_rlc.bin
 File: radeon/oland_smc.bin
 File: radeon/hainan_ce.bin
+File: radeon/hainan_k_smc.bin
 File: radeon/hainan_mc.bin
 File: radeon/hainan_me.bin
 File: radeon/hainan_pfp.bin
 File: radeon/hainan_rlc.bin
 File: radeon/hainan_smc.bin
 File: radeon/bonaire_ce.bin
+File: radeon/bonaire_k_smc.bin
 File: radeon/bonaire_mc.bin
 File: radeon/bonaire_me.bin
 File: radeon/bonaire_mec.bin
@@ -1803,6 +1809,7 @@ File: radeon/kaveri_sdma1.bin
 File: radeon/kaveri_uvd.bin
 File: radeon/kaveri_vce.bin
 File: radeon/hawaii_ce.bin
+File: radeon/hawaii_k_smc.bin
 File: radeon/hawaii_mc.bin
 File: radeon/hawaii_me.bin
 File: radeon/hawaii_mec.bin
@@ -2957,6 +2964,7 @@ File: qat_c3xxx.bin
 File: qat_c3xxx_mmp.bin
 File: qat_c62x.bin
 File: qat_c62x_mmp.bin
+Link: qat_mmp.bin -> qat_895xcc_mmp.bin
 
 Licence: Redistributable. See LICENCE.qat_firmware for details
 


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

[PATCH linux-firmware 11/12] WHENCE: Add reference to 'qca/NOTICE.txt'

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 606 bytes --]

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 WHENCE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WHENCE b/WHENCE
index 64fea97a20dc..aafd503f9447 100644
--- a/WHENCE
+++ b/WHENCE
@@ -3144,7 +3144,7 @@ File: qca/rampatch_usb_00000302.bin
 File: qca/rampatch_00130300.bin
 File: qca/rampatch_00130302.bin
 
-Licence: Redistributable. See LICENSE.QualcommAtheros_ath10k for details
+Licence: Redistributable. See LICENSE.QualcommAtheros_ath10k and qca/NOTICE.txt for details
 
 --------------------------------------------------------------------------
 


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

[PATCH linux-firmware 12/12] README: Say that files must be listed in WHENCE, and how to check it

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 1550 bytes --]

- Say that new files must, not 'should', be listed in WHENCE
- State the expected form of a reference to a separate licence file
- Mention 'make check'

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 README | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/README b/README
index cdaecf04b46e..77ff0106c483 100644
--- a/README
+++ b/README
@@ -16,16 +16,19 @@ diff or preferably a git pull request to:
       linux-firmware@kernel.org
 and also cc: to related mailing lists.
 
-Your commit should include an update to the WHENCE file clearly
-identifying the license under which the firmware is available, and
+If your commit adds new firmware, it must update the WHENCE file to
+clearly state the license under which the firmware is available, and
 that it is redistributable. Being redistributable includes ensuring
 the firmware license provided includes an implicit or explicit
 patent grant to end users to ensure full functionality of device
 operation with the firmware. If the license is long and involved, it's
 permitted to include it in a separate file and refer to it from the
-WHENCE file.
+WHENCE file ('See LICENSE.foo for details.').
 And if it were possible, a changelog of the firmware itself.
 
+Run 'make check' to check that WHENCE is consistent with the
+repository contents.
+
 Ideally, your commit should contain a Signed-Off-By: from someone
 authoritative on the licensing of the firmware in question (i.e. from
 within the company that owns the code).

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

Re: [PATCH linux-firmware 10/12] WHENCE: List new radeon CI and SI smc firmware

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 476 bytes --]

On Sun, Sep 18, 2016 at 03:03:43AM +0100, Ben Hutchings wrote:
[...]
> @@ -2957,6 +2964,7 @@ File: qat_c3xxx.bin
>  File: qat_c3xxx_mmp.bin
>  File: qat_c62x.bin
>  File: qat_c62x_mmp.bin
> +Link: qat_mmp.bin -> qat_895xcc_mmp.bin
>  
>  Licence: Redistributable. See LICENCE.qat_firmware for details
>  
> 

Oops, I'll move that last bit to a separate commit.

Ben.

-- 
Ben Hutchings
For every action, there is an equal and opposite criticism. - Harrison

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

Re: [PATCH linux-firmware 06/12] WHENCE: Remove references to two nvidia firmware files that were never added

[Alexandre Courbot]

On 09/18/2016 11:02 AM, Ben Hutchings wrote:
> * PGP Signed by an unknown key
> 
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

Stupid copy-paste. Thanks for catching this!

Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>

> ---
>  WHENCE | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/WHENCE b/WHENCE
> index 60028347b443..93927fcfe627 100644
> --- a/WHENCE
> +++ b/WHENCE
> @@ -3227,10 +3227,8 @@ File: nvidia/gm20b/gr/fecs_bl.bin
>  File: nvidia/gm20b/gr/fecs_data.bin
>  File: nvidia/gm20b/gr/fecs_inst.bin
>  File: nvidia/gm20b/gr/fecs_sig.bin
> -File: nvidia/gm20b/gr/gpccs_bl.bin
>  File: nvidia/gm20b/gr/gpccs_data.bin
>  File: nvidia/gm20b/gr/gpccs_inst.bin
> -File: nvidia/gm20b/gr/gpccs_sig.bin
>  File: nvidia/gm20b/gr/sw_bundle_init.bin
>  File: nvidia/gm20b/gr/sw_ctx.bin
>  File: nvidia/gm20b/gr/sw_method_init.bin
> 
> 
> * Unknown Key
> * 0x95861109
> 

Re: [PATCH linux-firmware 09/12] WHENCE: Fix metadata for snd-soc-skl firmware

[Vinod Koul]

[-- Attachment #1: Type: text/plain, Size: 280 bytes --]

On Sun, Sep 18, 2016 at 03:03:21AM +0100, Ben Hutchings wrote:
> Fix filename 'intel/dsp_fw_bxtn.bin'.  List all the files and their
> versions, not just the symlinks.  Delete the non-standard 'md5sum'
> fields.

Acked-by: Vinod Koul <vinod.koul@intel.com>


-- 
~Vinod

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

RE: [PATCH linux-firmware 10/12] WHENCE: List new radeon CI and SI smc firmware

[Deucher, Alexander]

> -----Original Message-----
> From: Ben Hutchings [mailto:ben@decadent.org.uk]
> Sent: Saturday, September 17, 2016 10:08 PM
> To: linux-kernel@vger.kernel.org; linux-firmware@kernel.org
> Cc: Deucher, Alexander
> Subject: Re: [PATCH linux-firmware 10/12] WHENCE: List new radeon CI and
> SI smc firmware
> 
> On Sun, Sep 18, 2016 at 03:03:43AM +0100, Ben Hutchings wrote:
> [...]
> > @@ -2957,6 +2964,7 @@ File: qat_c3xxx.bin
> >  File: qat_c3xxx_mmp.bin
> >  File: qat_c62x.bin
> >  File: qat_c62x_mmp.bin
> > +Link: qat_mmp.bin -> qat_895xcc_mmp.bin
> >
> >  Licence: Redistributable. See LICENCE.qat_firmware for details
> >
> >
> 
> Oops, I'll move that last bit to a separate commit.

With that fixed:
Acked-by: Alex Deucher <alexander.deucher@amd.com>


> 
> Ben.
> 
> --
> Ben Hutchings
> For every action, there is an equal and opposite criticism. - Harrison

Re: [PATCH linux-firmware 00/12] Fix metadata for linux-firmware

[Kyle McMartin]

On Sun, Sep 18, 2016 at 02:58:07AM +0100, Ben Hutchings wrote:
> This series adds a metadata consistency check script, fixes all the
> errors it found, and adds a reference to it in README.
> 
> If I don't hear any objections, I'll apply these changes next week.
> 
> Ben.

lgtm.