lkml.org 
[lkml]   [2014]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 7/8] SCSI: megaraid: Use resource_size_t for PCI resources, not long
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Ben Collins <ben.c@servergy.com>

    commit 11f8a7b31f2140b0dc164bb484281235ffbe51d3 upstream.

    The assumption that sizeof(long) >= sizeof(resource_size_t) can lead to
    truncation of the PCI resource address, meaning this driver didn't work
    on 32-bit systems with 64-bit PCI adressing ranges.

    Signed-off-by: Ben Collins <ben.c@servergy.com>
    Acked-by: Sumit Saxena <sumit.saxena@lsi.com>
    Signed-off-by: James Bottomley <JBottomley@Parallels.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/scsi/megaraid/megaraid_sas.h | 1 -
    drivers/scsi/megaraid/megaraid_sas_base.c | 5 +++--
    2 files changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/scsi/megaraid/megaraid_sas.h
    +++ b/drivers/scsi/megaraid/megaraid_sas.h
    @@ -1294,7 +1294,6 @@ struct megasas_instance {
    u32 *reply_queue;
    dma_addr_t reply_queue_h;

    - unsigned long base_addr;
    struct megasas_register_set __iomem *reg_set;

    struct megasas_pd_list pd_list[MEGASAS_MAX_PD];
    --- a/drivers/scsi/megaraid/megaraid_sas_base.c
    +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
    @@ -3445,6 +3445,7 @@ static int megasas_init_fw(struct megasa
    u32 max_sectors_1;
    u32 max_sectors_2;
    u32 tmp_sectors, msix_enable;
    + resource_size_t base_addr;
    struct megasas_register_set __iomem *reg_set;
    struct megasas_ctrl_info *ctrl_info;
    unsigned long bar_list;
    @@ -3453,14 +3454,14 @@ static int megasas_init_fw(struct megasa
    /* Find first memory bar */
    bar_list = pci_select_bars(instance->pdev, IORESOURCE_MEM);
    instance->bar = find_first_bit(&bar_list, sizeof(unsigned long));
    - instance->base_addr = pci_resource_start(instance->pdev, instance->bar);
    if (pci_request_selected_regions(instance->pdev, instance->bar,
    "megasas: LSI")) {
    printk(KERN_DEBUG "megasas: IO memory region busy!\n");
    return -EBUSY;
    }

    - instance->reg_set = ioremap_nocache(instance->base_addr, 8192);
    + base_addr = pci_resource_start(instance->pdev, instance->bar);
    + instance->reg_set = ioremap_nocache(base_addr, 8192);

    if (!instance->reg_set) {
    printk(KERN_DEBUG "megasas: Failed to map IO mem\n");



    \
     
     \ /
      Last update: 2014-06-13 03:21    [W:2.277 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site