Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b381f783 authored by Denys Vlasenko's avatar Denys Vlasenko Committed by David S. Miller
Browse files

liquidio: stop using huge static buffer, save 4096k in .data 



Only compile-tested - I don't have the hardware.

>From code inspection, octeon_pci_write_core_mem() appears to be safe wrt
unaligned source. In any case, u8 fbuf[] was not guaranteed to be aligned
anyway.

Signed-off-by: default avatarDenys Vlasenko <dvlasenk@redhat.com>
CC: Felix Manlunas <felix.manlunas@cavium.com>
CC: Prasad Kanneganti <prasad.kanneganti@cavium.com>
CC: Derek Chickles <derek.chickles@cavium.com>
CC: David Miller <davem@davemloft.net>
CC: netdev@vger.kernel.org
CC: linux-kernel@vger.kernel.org
Acked-by: default avatarFelix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3d091982

drivers/net/ethernet/cavium/liquidio/octeon_console.c

+1 −5
Original line number Diff line number Diff line
@@ -724,13 +724,11 @@ static int octeon_console_read(struct octeon_device *oct, u32 console_num, 
}



#define FBUF_SIZE	(4 * 1024 * 1024)

u8 fbuf[FBUF_SIZE];



int octeon_download_firmware(struct octeon_device *oct, const u8 *data,

			     size_t size)

{

	int ret = 0;

	u8 *p = fbuf;

	u32 crc32_result;

	u64 load_addr;

	u32 image_len;
@@ -805,10 +803,8 @@ int octeon_download_firmware(struct octeon_device *oct, const u8 *data, 
			else

				size = FBUF_SIZE;



			memcpy(p, data, size);



			/* download the image */

			octeon_pci_write_core_mem(oct, load_addr, p, (u32)size);

			octeon_pci_write_core_mem(oct, load_addr, data, (u32)size);



			data += size;

			rem -= (u32)size;

drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c

+2 −2
Original line number Diff line number Diff line
@@ -167,10 +167,10 @@ octeon_pci_read_core_mem(struct octeon_device *oct, 
void

octeon_pci_write_core_mem(struct octeon_device *oct,

			  u64 coreaddr,

			  u8 *buf,

			  const u8 *buf,

			  u32 len)

{

	__octeon_pci_rw_core_mem(oct, coreaddr, buf, len, 0);

	__octeon_pci_rw_core_mem(oct, coreaddr, (u8 *)buf, len, 0);

}



u64 octeon_read_device_mem64(struct octeon_device *oct, u64 coreaddr)

drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ octeon_pci_read_core_mem(struct octeon_device *oct, 
void

octeon_pci_write_core_mem(struct octeon_device *oct,

			  u64 coreaddr,

			  u8 *buf,

			  const u8 *buf,

			  u32 len);



#endif