Menu
▾
▴
Re: [Acx100-devel] [PATCH 1/6] merge.c: #if0 acxmem_allocate_acx_txbuf_space, mem.c has it
|
From: Oliver W. <oli...@ol...> - 2012-04-29 18:03:34
|
Hi Jim,
The latest series of 6 is applied and pushed ;)! Thanks a lot again!
it was interesting, because the series revealed and reminded me
of a number of things ;):
I was puzzled by patch#5, which strangely didn't want to apply to
acx_struct_dev.h. Finally it turned out, that acx_struct_dev.h was
using CRLFs ... (took me some time to find out: vim was suddenly showing
^M and before he wasn't (he showed them only with mixed CRLF/LF, after I
forced the patch into ... anyway ;).
So I fixed that before and then everything applied nicely.
Then there was still some UTF-8 chars in mem.h, which I also fixed at
that occasion. Now a "file *.h *.c" is all "(C source, )?ASCII text".
Patch#4 was also interesting, because I recognized, that acxpci_reset_mac()
is actually not used with CONFIG_VLYNQ. It works anyhow it seems, but I need to
check that one time. I also fixed there the vlynq build - you see.
Patch#6: This was certainly an interesting exercise ;)! ... and
it did remind me, that the io/membase part of struct acx_device is
really still messy ... it'll somehow work (at least seems to me), as long
as you don't try to use a mem and pci device on 64bit.
This needs really onetime to be fixed correctly and with the foreseen types
of the io/dma layer (void __iomem) of the kernel. For mem this means, that
the IO-macros would need to adapted accordingly.
The OOPs you saw was maybe related to the build not being entirely refreshed.
I checked onetime with pahole (see below), and although the overall size didn't
change, the layout did still change.
Apart from that, the type mess also actually also made a type-changes on
membase(2) between pci.o and merge.o. I'm not sure if that can become really
problem, but doesn't look consistent at least.
I added this that to the TODO ;)!
Cheers and Thanks again! Oliver ;)
pci.o, all configs, before commit:
---
> struct device * bus_dev; /* 1728 4 */
> struct pci_dev * pdev; /* 1732 4 */
> long unsigned int membase; /* 1736 4 */
> long unsigned int membase2; /* 1740 4 */
> void * iobase; /* 1744 4 */
> void * iobase2; /* 1748 4 */
---
pci.o, all configs, after commit:
---
> struct device * bus_dev; /* 1728 4 */
> struct pci_dev * pdev; /* 1732 4 */
> long unsigned int membase; /* 1736 4 */
> void * iobase; /* 1740 4 */
> long unsigned int membase2; /* 1744 4 */
> void * iobase2; /* 1748 4 */
---
mem.o, all configs, before commit:
---
> struct device * bus_dev; /* 1728 4 */
> struct platform_device * pdev; /* 1732 4 */
> volatile u32 * membase; /* 1736 4 */
> long unsigned int membase2; /* 1740 4 */
> volatile u32 * iobase; /* 1744 4 */
> void * iobase2; /* 1748 4 */
---
mem.o, all configs, after commit:
---
> struct device * bus_dev; /* 1728 4 */
> struct platform_device * pdev; /* 1732 4 */
> volatile u32 * membase; /* 1736 4 */
> volatile u32 * iobase; /* 1740 4 */
> long unsigned int membase2; /* 1744 4 */
> void * iobase2; /* 1748 4 */
---
merge.o, all configs, before commit:
---
> struct device * bus_dev; /* 1728 4 */
> struct platform_device * pdev; /* 1732 4 */
> volatile u32 * membase; /* 1736 4 */
> long unsigned int membase2; /* 1740 4 */
> volatile u32 * iobase; /* 1744 4 */
> void * iobase2; /* 1748 4 */
---
merge.o, all config, after commit:
---
> struct device * bus_dev; /* 1728 4 */
> struct platform_device * pdev; /* 1732 4 */
> volatile u32 * membase; /* 1736 4 */
> volatile u32 * iobase; /* 1740 4 */
> long unsigned int membase2; /* 1744 4 */
> void * iobase2; /* 1748 4 */
---
On 04/27/2012 06:34 AM, Jim Cromie wrote:
> Signed-off-by: Jim Cromie <jim...@gm...>
> ---
> merge.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/merge.c b/merge.c
> index 813cdf0..6fe00fb 100644
> --- a/merge.c
> +++ b/merge.c
> @@ -2453,6 +2453,7 @@ void acxmem_dealloc_tx(acx_device_t *adev, tx_t *tx_opaque) {
> /*
> * Return an acx pointer to the next transmit data block.
> */
> +#if 0 // using copy in mem.c
> static u32 acxmem_allocate_acx_txbuf_space(acx_device_t *adev, int count) {
> u32 block, next, last_block;
> int blocks_needed;
> @@ -2512,6 +2513,7 @@ static u32 acxmem_allocate_acx_txbuf_space(acx_device_t *adev, int count) {
>
> return block;
> }
> +#endif
>
> /*
> * Return buffer space back to the pool by following the next pointers until we find
|