Patch "PCI: Make PCI_ROM_ADDRESS_MASK a 32-bit constant" has been added to the 4.4-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
PCI: Make PCI_ROM_ADDRESS_MASK a 32-bit constant
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
pci-make-pci_rom_address_mask-a-32-bit-constant.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
76dc52684d0f72971d9f6cc7d5ae198061b715bdMon Sep 17 00:00:00 2001
From: Matthias Kaehlcke <[email protected]>
Date: Fri, 14 Apr 2017 13:38:02 -0700
Subject: PCI: Make PCI_ROM_ADDRESS_MASK a 32-bit constant
From: Matthias Kaehlcke <[email protected]>
commit 76dc52684d0f72971d9f6cc7d5ae198061b715bd upstream.
A 64-bit value is not needed since a PCI ROM address consists in 32 bits. This fixes a clang warning about "implicit conversion from 'unsigned long' to 'u32'".
Also remove now unnecessary casts to u32 from __pci_read_base() and pci_std_update_resource().
--- drivers/pci/probe.c | 2 +- drivers/pci/setup-res.c | 2 +- include/uapi/linux/pci_regs.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/pci/probe.c +1 -1
@@ -230,7 +230,7 @@ int __pci_read_base(struct pci_dev *dev, res->flags |=IORESOURCE_ROM_ENABLE ; l64 = l &PCI_ROM_ADDRESS_MASK ; sz64 = sz &PCI_ROM_ADDRESS_MASK ; - mask64 = (u32 )PCI_ROM_ADDRESS_MASK ; + mask64 =PCI_ROM_ADDRESS_MASK ; }if (res->flags &IORESOURCE_MEM_64 ) {
drivers/pci/setup-res.c +1 -1
@@ -63,7 +63,7 @@ static void pci_std_update_resource(stru mask = (u32 )PCI_BASE_ADDRESS_IO_MASK ; new |= res->flags & ~PCI_BASE_ADDRESS_IO_MASK ; }else if (resno ==PCI_ROM_RESOURCE ) { - mask = (u32 )PCI_ROM_ADDRESS_MASK ; + mask =PCI_ROM_ADDRESS_MASK ; }else { mask = (u32 )PCI_BASE_ADDRESS_MEM_MASK ; new |= res->flags & ~PCI_BASE_ADDRESS_MEM_MASK ;
include/uapi/linux/pci_regs.h +1 -1
@@ -106,7 +106,7 @@#define PCI_SUBSYSTEM_ID 0x2e#define PCI_ROM_ADDRESS 0x30/* Bits 31..11 are address, 10..1 reserved */ #define PCI_ROM_ADDRESS_ENABLE 0x01 -#define PCI_ROM_ADDRESS_MASK (~0x7ffUL) +#define PCI_ROM_ADDRESS_MASK (~0x7ffU)#define PCI_CAPABILITY_LIST 0x34/* Offset of first capability list entry */
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/dm-ioctl-remove-double-parentheses.patch queue-4.4/genirq-use-cpumask_available-for-check-of-cpumask-variable.patch queue-4.4/fs-compat-remove-warning-from-compatible_ioctl.patch queue-4.4/selinux-remove-unnecessary-check-of-array-base-in-selinux_set_mapping.patch queue-4.4/pci-make-pci_rom_address_mask-a-32-bit-constant.patch queue-4.4/cpumask-add-helper-cpumask_available.patch