2016-04-13 21:27:16

by David Daney

Subject: [PATCH] pm80xx: Remove bogus address masking in pm8001_ioremap()

From: David Daney <[email protected]>

It is unclear what the original intent of the masking was, but it is
clearly incorrect to truncate a physical address before calling
ioremap(). On systems where there are valid physical address bits
above bit-31 (arm64 for example) the result is an eventual OOPs when
initializing the driver.

Remove the bogus code to fix it.

Signed-off-by: David Daney <[email protected]>
---
drivers/scsi/pm8001/pm8001_init.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index 062ab34..6bd7bf4 100644
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -418,8 +418,6 @@ static int pm8001_ioremap(struct pm8001_hba_info *pm8001_ha)
if (pci_resource_flags(pdev, bar) & IORESOURCE_MEM) {
pm8001_ha->io_mem[logicalBar].membase =
pci_resource_start(pdev, bar);
- pm8001_ha->io_mem[logicalBar].membase &=
- (u32)PCI_BASE_ADDRESS_MEM_MASK;
pm8001_ha->io_mem[logicalBar].memsize =
pci_resource_len(pdev, bar);
pm8001_ha->io_mem[logicalBar].memvirtaddr =
--
1.8.3.1

2016-04-14 12:23:08

by Jack Wang

Subject: Re: [PATCH] pm80xx: Remove bogus address masking in pm8001_ioremap()

On Wed, Apr 13, 2016 at 11:26 PM, David Daney <[email protected]> wrote:
> From: David Daney <[email protected]>
>
> It is unclear what the original intent of the masking was, but it is
> clearly incorrect to truncate a physical address before calling
> ioremap(). On systems where there are valid physical address bits
> above bit-31 (arm64 for example) the result is an eventual OOPs when
> initializing the driver.
>
> Remove the bogus code to fix it.
>
> Signed-off-by: David Daney <[email protected]>
> ---
> drivers/scsi/pm8001/pm8001_init.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
> index 062ab34..6bd7bf4 100644
> --- a/drivers/scsi/pm8001/pm8001_init.c
> +++ b/drivers/scsi/pm8001/pm8001_init.c
> @@ -418,8 +418,6 @@ static int pm8001_ioremap(struct pm8001_hba_info *pm8001_ha)
> if (pci_resource_flags(pdev, bar) & IORESOURCE_MEM) {
> pm8001_ha->io_mem[logicalBar].membase =
> pci_resource_start(pdev, bar);
> - pm8001_ha->io_mem[logicalBar].membase &=
> - (u32)PCI_BASE_ADDRESS_MEM_MASK;
> pm8001_ha->io_mem[logicalBar].memsize =
> pci_resource_len(pdev, bar);
> pm8001_ha->io_mem[logicalBar].memvirtaddr =
> --
> 1.8.3.1
>

Thanks, looks good to me.
Acked-by: Jack Wang <[email protected]>

2016-04-15 02:38:43

by Martin K. Petersen

Subject: Re: [PATCH] pm80xx: Remove bogus address masking in pm8001_ioremap()

>>>>> "David" == David Daney <[email protected]> writes:

David> It is unclear what the original intent of the masking was, but it
David> is clearly incorrect to truncate a physical address before
David> calling ioremap(). On systems where there are valid physical
David> address bits above bit-31 (arm64 for example) the result is an
David> eventual OOPs when initializing the driver.

David> Remove the bogus code to fix it.

Applied to 4.7/scsi-queue.

--
Martin K. Petersen Oracle Linux Engineering