lkml.org 
[lkml]   [2018]   [Apr]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 14/72] PCI: Make PCI_ROM_ADDRESS_MASK a 32-bit constant
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Matthias Kaehlcke <mka@chromium.org>

    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().

    Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Cc: Nathan Chancellor <natechancellor@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    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(-)

    --- a/drivers/pci/probe.c
    +++ b/drivers/pci/probe.c
    @@ -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) {
    --- a/drivers/pci/setup-res.c
    +++ b/drivers/pci/setup-res.c
    @@ -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;
    --- a/include/uapi/linux/pci_regs.h
    +++ b/include/uapi/linux/pci_regs.h
    @@ -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 */


    \
     
     \ /
      Last update: 2018-04-06 17:01    [W:4.047 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site