Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1669895 > unrolled thread
| Started by | Denys Vlasenko <dvlasenk@redhat.com> |
|---|---|
| First post | 2017-06-19 22:00 +0200 |
| Last post | 2017-06-22 17:10 +0200 |
| Articles | 5 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] liquidio: stop using huge static buffer, save 4096k in .data Denys Vlasenko <dvlasenk@redhat.com> - 2017-06-19 22:00 +0200
Re: [PATCH] liquidio: stop using huge static buffer, save 4096k in .data David Miller <davem@davemloft.net> - 2017-06-20 21:30 +0200
RE: [PATCH] liquidio: stop using huge static buffer, save 4096k in .data "Chickles, Derek" <Derek.Chickles@cavium.com> - 2017-06-20 22:20 +0200
Re: [PATCH] liquidio: stop using huge static buffer, save 4096k in .data David Miller <davem@davemloft.net> - 2017-06-21 03:20 +0200
Re: [PATCH] liquidio: stop using huge static buffer, save 4096k in .data David Miller <davem@davemloft.net> - 2017-06-22 17:10 +0200
| From | Denys Vlasenko <dvlasenk@redhat.com> |
|---|---|
| Date | 2017-06-19 22:00 +0200 |
| Subject | [PATCH] liquidio: stop using huge static buffer, save 4096k in .data |
| Message-ID | <tUb06-72g-11@gated-at.bofh.it> |
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: Denys 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
---
drivers/net/ethernet/cavium/liquidio/octeon_console.c | 6 +-----
drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c | 4 ++--
drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.h | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_console.c b/drivers/net/ethernet/cavium/liquidio/octeon_console.c
index 53f38d0..e08f760 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_console.c
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_console.c
@@ -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;
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c b/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c
index 5cd96e7..4c85ae6 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.c
@@ -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)
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.h b/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.h
index bae2fdd..47a3ff5 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_mem_ops.h
@@ -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
--
2.9.2
[toc] | [next] | [standalone]
| From | David Miller <davem@davemloft.net> |
|---|---|
| Date | 2017-06-20 21:30 +0200 |
| Subject | Re: [PATCH] liquidio: stop using huge static buffer, save 4096k in .data |
| Message-ID | <tUx0C-4hm-15@gated-at.bofh.it> |
| In reply to | #1669895 |
From: Denys Vlasenko <dvlasenk@redhat.com> Date: Mon, 19 Jun 2017 21:50:52 +0200 > 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: Denys Vlasenko <dvlasenk@redhat.com> Looks good to me but I'll let one of the liquidio guys review this first before I apply it.
[toc] | [prev] | [next] | [standalone]
| From | "Chickles, Derek" <Derek.Chickles@cavium.com> |
|---|---|
| Date | 2017-06-20 22:20 +0200 |
| Subject | RE: [PATCH] liquidio: stop using huge static buffer, save 4096k in .data |
| Message-ID | <tUxN0-4P5-11@gated-at.bofh.it> |
| In reply to | #1671036 |
> From: David Miller [mailto:davem@davemloft.net] > Sent: Tuesday, June 20, 2017 12:22 PM > > From: Denys Vlasenko <dvlasenk@redhat.com> > Date: Mon, 19 Jun 2017 21:50:52 +0200 > > > 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: Denys Vlasenko <dvlasenk@redhat.com> > > Looks good to me but I'll let one of the liquidio guys review this first > before I apply it. Felix is going to try this out this week to confirm. Let's wait for his ack.
[toc] | [prev] | [next] | [standalone]
| From | David Miller <davem@davemloft.net> |
|---|---|
| Date | 2017-06-21 03:20 +0200 |
| Subject | Re: [PATCH] liquidio: stop using huge static buffer, save 4096k in .data |
| Message-ID | <tUCtj-7Kk-1@gated-at.bofh.it> |
| In reply to | #1671068 |
From: Felix Manlunas <felix.manlunas@cavium.com> Date: Tue, 20 Jun 2017 13:51:25 -0700 > From: Derek Chickles <Derek.Chickles@cavium.com> > Date: Tue, 20 Jun 2017 13:15:34 -0700 > >> > From: David Miller [mailto:davem@davemloft.net] >> > Sent: Tuesday, June 20, 2017 12:22 PM >> > >> > From: Denys Vlasenko <dvlasenk@redhat.com> >> > Date: Mon, 19 Jun 2017 21:50:52 +0200 >> > >> > > 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: Denys Vlasenko <dvlasenk@redhat.com> >> > >> > Looks good to me but I'll let one of the liquidio guys review this first >> > before I apply it. >> >> Felix is going to try this out this week to confirm. Let's wait for his ack. > > This patch works. I tested it with a LiquidIO II adapter. > > ACK Please ACK patches in the standard way which is in the form of: Acked-by: David S. Miller <davem@davemloft.net> This tag is recognized by tools and in particular the patchwork site where networking patches are maintained, automatically including your ACK into the patch I apply.
[toc] | [prev] | [next] | [standalone]
| From | David Miller <davem@davemloft.net> |
|---|---|
| Date | 2017-06-22 17:10 +0200 |
| Subject | Re: [PATCH] liquidio: stop using huge static buffer, save 4096k in .data |
| Message-ID | <tVbU6-6qX-9@gated-at.bofh.it> |
| In reply to | #1669895 |
From: Denys Vlasenko <dvlasenk@redhat.com> Date: Mon, 19 Jun 2017 21:50:52 +0200 > 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: Denys Vlasenko <dvlasenk@redhat.com> Applied to net-next, thanks.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web