diff mbox

[v2] PCI: iproc: fix 32-bit build error

Message ID 5754881.OPA6La0Zg0@wuerfel (mailing list archive)
State New, archived
Delegated to: Bjorn Helgaas
Headers show

Commit Message

Arnd Bergmann Oct. 15, 2015, 7:40 p.m. UTC 
The iproc PCI driver tries to figure out whether the MMIO window has
a valid size, but does this using a 64-bit modulo operation, which
is not allowed on 32-bit kernels and leads to a link error:

drivers/built-in.o: In function `iproc_pcie_setup':
:(.text+0x4b798): undefined reference to `__aeabi_uldivmod'

This works around that error by using the div64_u64() function
provided by the kernel. While this is an expensive operation,
it is harmless because we only call it during the probing
of the driver.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Ray Jui <rjui@broadcom.com>
Fixes: 0ab99ca8eb6c ("PCI: iproc: Fix compile warnings")

---
On Thursday 15 October 2015 09:19:27 Ray Jui wrote:
> On 10/15/2015 9:00 AM, Bjorn Helgaas wrote:
> > 
> > Ping; I can easily fix up the static, but it'd be nice to have real acks
> > from Ray and Hauke.


Argh, I knew there was one patch from my build fixes that I needed to
redo, I just couldn't find it again. Thanks for the reminder.



--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Hauke Mehrtens Oct. 15, 2015, 8:57 p.m. UTC | #1 
On 10/15/2015 09:40 PM, Arnd Bergmann wrote:
> The iproc PCI driver tries to figure out whether the MMIO window has
> a valid size, but does this using a 64-bit modulo operation, which
> is not allowed on 32-bit kernels and leads to a link error:
> 
> drivers/built-in.o: In function `iproc_pcie_setup':
> :(.text+0x4b798): undefined reference to `__aeabi_uldivmod'
> 
> This works around that error by using the div64_u64() function
> provided by the kernel. While this is an expensive operation,
> it is harmless because we only call it during the probing
> of the driver.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Acked-by: Ray Jui <rjui@broadcom.com>

Acked-by: Hauke Mehrtens <hauke@hauke-m.de>

> Fixes: 0ab99ca8eb6c ("PCI: iproc: Fix compile warnings")
> 
> ---
> On Thursday 15 October 2015 09:19:27 Ray Jui wrote:
>> On 10/15/2015 9:00 AM, Bjorn Helgaas wrote:
>>>
>>> Ping; I can easily fix up the static, but it'd be nice to have real acks
>>> from Ray and Hauke.
> 
> 
> Argh, I knew there was one patch from my build fixes that I needed to
> redo, I just couldn't find it again. Thanks for the reminder.
> 
> 
> diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c
> index f3481ddff344..9193951ae861 100644
> --- a/drivers/pci/host/pcie-iproc.c
> +++ b/drivers/pci/host/pcie-iproc.c
> @@ -241,6 +241,7 @@ static int iproc_pcie_setup_ob(struct iproc_pcie *pcie, u64 axi_addr,
>  	struct iproc_pcie_ob *ob = &pcie->ob;
>  	unsigned i;
>  	u64 max_size = (u64)ob->window_size * MAX_NUM_OB_WINDOWS;
> +	u64 remainder;
>  
>  	if (size > max_size) {
>  		dev_err(pcie->dev,
> @@ -249,7 +250,8 @@ static int iproc_pcie_setup_ob(struct iproc_pcie *pcie, u64 axi_addr,
>  		return -EINVAL;
>  	}
>  
> -	if (size % ob->window_size) {
> +	div64_u64_rem(size, ob->window_size, &remainder);
> +	if (remainder) {
>  		dev_err(pcie->dev,
>  			"res size %pap needs to be multiple of window size %pap\n",
>  			&size, &ob->window_size);
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Bjorn Helgaas Oct. 15, 2015, 9:01 p.m. UTC | #2 
On Thu, Oct 15, 2015 at 09:40:45PM +0200, Arnd Bergmann wrote:
> The iproc PCI driver tries to figure out whether the MMIO window has
> a valid size, but does this using a 64-bit modulo operation, which
> is not allowed on 32-bit kernels and leads to a link error:
> 
> drivers/built-in.o: In function `iproc_pcie_setup':
> :(.text+0x4b798): undefined reference to `__aeabi_uldivmod'
> 
> This works around that error by using the div64_u64() function
> provided by the kernel. While this is an expensive operation,
> it is harmless because we only call it during the probing
> of the driver.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Acked-by: Ray Jui <rjui@broadcom.com>
> Fixes: 0ab99ca8eb6c ("PCI: iproc: Fix compile warnings")

This *looks* like it should be fixing 90e4032eeaf2 ("PCI: iproc: Add
outbound mapping support"), not 0ab99ca8eb6c.

90e4032eeaf2 added the "if (size % ob->window_size)".

Is this more subtle than that?

> ---
> On Thursday 15 October 2015 09:19:27 Ray Jui wrote:
> > On 10/15/2015 9:00 AM, Bjorn Helgaas wrote:
> > > 
> > > Ping; I can easily fix up the static, but it'd be nice to have real acks
> > > from Ray and Hauke.
> 
> 
> Argh, I knew there was one patch from my build fixes that I needed to
> redo, I just couldn't find it again. Thanks for the reminder.
> 
> 
> diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c
> index f3481ddff344..9193951ae861 100644
> --- a/drivers/pci/host/pcie-iproc.c
> +++ b/drivers/pci/host/pcie-iproc.c
> @@ -241,6 +241,7 @@ static int iproc_pcie_setup_ob(struct iproc_pcie *pcie, u64 axi_addr,
>  	struct iproc_pcie_ob *ob = &pcie->ob;
>  	unsigned i;
>  	u64 max_size = (u64)ob->window_size * MAX_NUM_OB_WINDOWS;
> +	u64 remainder;
>  
>  	if (size > max_size) {
>  		dev_err(pcie->dev,
> @@ -249,7 +250,8 @@ static int iproc_pcie_setup_ob(struct iproc_pcie *pcie, u64 axi_addr,
>  		return -EINVAL;
>  	}
>  
> -	if (size % ob->window_size) {
> +	div64_u64_rem(size, ob->window_size, &remainder);
> +	if (remainder) {
>  		dev_err(pcie->dev,
>  			"res size %pap needs to be multiple of window size %pap\n",
>  			&size, &ob->window_size);
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Arnd Bergmann Oct. 16, 2015, 9:47 a.m. UTC | #3 
On Thursday 15 October 2015 16:01:13 Bjorn Helgaas wrote:
> On Thu, Oct 15, 2015 at 09:40:45PM +0200, Arnd Bergmann wrote:
> > The iproc PCI driver tries to figure out whether the MMIO window has
> > a valid size, but does this using a 64-bit modulo operation, which
> > is not allowed on 32-bit kernels and leads to a link error:
> > 
> > drivers/built-in.o: In function `iproc_pcie_setup':
> > :(.text+0x4b798): undefined reference to `__aeabi_uldivmod'
> > 
> > This works around that error by using the div64_u64() function
> > provided by the kernel. While this is an expensive operation,
> > it is harmless because we only call it during the probing
> > of the driver.
> > 
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > Acked-by: Ray Jui <rjui@broadcom.com>
> > Fixes: 0ab99ca8eb6c ("PCI: iproc: Fix compile warnings")
> 
> This *looks* like it should be fixing 90e4032eeaf2 ("PCI: iproc: Add
> outbound mapping support"), not 0ab99ca8eb6c.
> 
> 90e4032eeaf2 added the "if (size % ob->window_size)".
> 
> Is this more subtle than that?
> 
> 

You are absolutely right, I must have copy-pasted the wrong entry.
Do you want me to resend this? I guess you can just remove the
line as this commit has not appeared in any release anyway.

	Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Bjorn Helgaas Oct. 16, 2015, 1:23 p.m. UTC | #4 
On Fri, Oct 16, 2015 at 11:47:42AM +0200, Arnd Bergmann wrote:
> On Thursday 15 October 2015 16:01:13 Bjorn Helgaas wrote:
> > On Thu, Oct 15, 2015 at 09:40:45PM +0200, Arnd Bergmann wrote:
> > > The iproc PCI driver tries to figure out whether the MMIO window has
> > > a valid size, but does this using a 64-bit modulo operation, which
> > > is not allowed on 32-bit kernels and leads to a link error:
> > > 
> > > drivers/built-in.o: In function `iproc_pcie_setup':
> > > :(.text+0x4b798): undefined reference to `__aeabi_uldivmod'
> > > 
> > > This works around that error by using the div64_u64() function
> > > provided by the kernel. While this is an expensive operation,
> > > it is harmless because we only call it during the probing
> > > of the driver.
> > > 
> > > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > > Acked-by: Ray Jui <rjui@broadcom.com>
> > > Fixes: 0ab99ca8eb6c ("PCI: iproc: Fix compile warnings")
> > 
> > This *looks* like it should be fixing 90e4032eeaf2 ("PCI: iproc: Add
> > outbound mapping support"), not 0ab99ca8eb6c.
> > 
> > 90e4032eeaf2 added the "if (size % ob->window_size)".
> > 
> > Is this more subtle than that?
> 
> You are absolutely right, I must have copy-pasted the wrong entry.
> Do you want me to resend this? I guess you can just remove the
> line as this commit has not appeared in any release anyway.

I squashed this fix and Jon's %pap fix into Ray's original "Add outbound
mapping support" patch and re-did the merge.  Thanks!

Bjorn
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c
index f3481ddff344..9193951ae861 100644
--- a/drivers/pci/host/pcie-iproc.c
+++ b/drivers/pci/host/pcie-iproc.c
@@ -241,6 +241,7 @@  static int iproc_pcie_setup_ob(struct iproc_pcie *pcie, u64 axi_addr,
 	struct iproc_pcie_ob *ob = &pcie->ob;
 	unsigned i;
 	u64 max_size = (u64)ob->window_size * MAX_NUM_OB_WINDOWS;
+	u64 remainder;
 
 	if (size > max_size) {
 		dev_err(pcie->dev,
@@ -249,7 +250,8 @@  static int iproc_pcie_setup_ob(struct iproc_pcie *pcie, u64 axi_addr,
 		return -EINVAL;
 	}
 
-	if (size % ob->window_size) {
+	div64_u64_rem(size, ob->window_size, &remainder);
+	if (remainder) {
 		dev_err(pcie->dev,
 			"res size %pap needs to be multiple of window size %pap\n",
 			&size, &ob->window_size);