On Thu, Aug 25, 2016 at 06:39:41PM -0400, Alan Ott wrote:
Remove the hard-coded page size and instead use EFI_SIZE_TO_PAGES() to convert a number of bytes into a number of pages.
Clearly an improvement, but given the minor confusion in (the edk2) naming, may be worth an addition in the commit message to clarify that the EFI_PAGE_SIZE is not the same as the processor page size. (I had a minute or two of thinking this could be unusable for EBC.)
Or more succinctly - could this be modified to: '... into a number of 4K EFI pages.' ?
If so (please confirm): Reviewed-by: Leif Lindholm leif.lindholm@linaro.org No need to resubmit, I can fix on commit.
Thanks!
/ Leif
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Alan Ott alan@softiron.co.uk
Drivers/Net/MarvellYukonDxe/if_msk.c | 12 ++++++------ Drivers/Net/MarvellYukonDxe/if_mskreg.h | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/Drivers/Net/MarvellYukonDxe/if_msk.c b/Drivers/Net/MarvellYukonDxe/if_msk.c index 2f10240..7979bf3 100644 --- a/Drivers/Net/MarvellYukonDxe/if_msk.c +++ b/Drivers/Net/MarvellYukonDxe/if_msk.c @@ -1467,7 +1467,7 @@ msk_status_dma_alloc ( UINTN Length; Status = mPciIo->AllocateBuffer (mPciIo, AllocateAnyPages, EfiBootServicesData,
BYTES_TO_PAGES (MSK_STAT_RING_SZ), (VOID**)&mSoftc->msk_stat_ring, 0);
EFI_SIZE_TO_PAGES (MSK_STAT_RING_SZ), (VOID**)&mSoftc->msk_stat_ring, 0);if (EFI_ERROR (Status)) { DEBUG ((EFI_D_ERROR, "Marvell Yukon: failed to allocate DMA'able memory for status ring\n")); @@ -1496,7 +1496,7 @@ msk_status_dma_free ( if (mSoftc->msk_stat_map) { mPciIo->Unmap (mPciIo, mSoftc->msk_stat_map); if (mSoftc->msk_stat_ring) {
mPciIo->FreeBuffer (mPciIo, BYTES_TO_PAGES (MSK_STAT_RING_SZ), mSoftc->msk_stat_ring);
mPciIo->FreeBuffer (mPciIo, EFI_SIZE_TO_PAGES (MSK_STAT_RING_SZ), mSoftc->msk_stat_ring); mSoftc->msk_stat_ring = NULL;@@ -1516,7 +1516,7 @@ msk_txrx_dma_alloc ( EFI_STATUS Status; Status = mPciIo->AllocateBuffer (mPciIo, AllocateAnyPages, EfiBootServicesData,
BYTES_TO_PAGES (MSK_TX_RING_SZ), (VOID**)&sc_if->msk_rdata.msk_tx_ring, 0);
EFI_SIZE_TO_PAGES (MSK_TX_RING_SZ), (VOID**)&sc_if->msk_rdata.msk_tx_ring, 0);if (EFI_ERROR (Status)) { DEBUG ((EFI_D_ERROR, "Marvell Yukon: failed to allocate DMA'able memory for Tx ring\n")); @@ -1535,7 +1535,7 @@ msk_txrx_dma_alloc ( ASSERT (Length == MSK_TX_RING_SZ); Status = mPciIo->AllocateBuffer (mPciIo, AllocateAnyPages, EfiBootServicesData,
BYTES_TO_PAGES (MSK_RX_RING_SZ), (VOID**)&sc_if->msk_rdata.msk_rx_ring, 0);
EFI_SIZE_TO_PAGES (MSK_RX_RING_SZ), (VOID**)&sc_if->msk_rdata.msk_rx_ring, 0);if (EFI_ERROR (Status)) { DEBUG ((EFI_D_ERROR, "Marvell Yukon: failed to allocate DMA'able memory for Rx ring\n")); @@ -1582,7 +1582,7 @@ msk_txrx_dma_free ( if (sc_if->msk_cdata.msk_tx_ring_map) { mPciIo->Unmap (mPciIo, sc_if->msk_cdata.msk_tx_ring_map); if (sc_if->msk_rdata.msk_tx_ring) {
mPciIo->FreeBuffer (mPciIo, BYTES_TO_PAGES (MSK_TX_RING_SZ), sc_if->msk_rdata.msk_tx_ring);
mPciIo->FreeBuffer (mPciIo, EFI_SIZE_TO_PAGES (MSK_TX_RING_SZ), sc_if->msk_rdata.msk_tx_ring); sc_if->msk_rdata.msk_tx_ring = NULL;@@ -1592,7 +1592,7 @@ msk_txrx_dma_free ( if (sc_if->msk_cdata.msk_rx_ring_map) { mPciIo->Unmap (mPciIo, sc_if->msk_cdata.msk_rx_ring_map); if (sc_if->msk_rdata.msk_rx_ring) {
mPciIo->FreeBuffer (mPciIo, BYTES_TO_PAGES (MSK_RX_RING_SZ), sc_if->msk_rdata.msk_rx_ring);
mPciIo->FreeBuffer (mPciIo, EFI_SIZE_TO_PAGES (MSK_RX_RING_SZ), sc_if->msk_rdata.msk_rx_ring); sc_if->msk_rdata.msk_rx_ring = NULL;diff --git a/Drivers/Net/MarvellYukonDxe/if_mskreg.h b/Drivers/Net/MarvellYukonDxe/if_mskreg.h index 64a30a2..f0dd05e 100644 --- a/Drivers/Net/MarvellYukonDxe/if_mskreg.h +++ b/Drivers/Net/MarvellYukonDxe/if_mskreg.h @@ -2275,8 +2275,6 @@ struct msk_stat_desc { #define MSK_MIN_FRAMELEN (ETHER_MIN_LEN - ETHER_CRC_LEN) */ -#define PAGE_SIZE 0x1000 -#define BYTES_TO_PAGES(BYTES) ((((BYTES) - 1) / PAGE_SIZE) + 1) #define htole32(x) (x) // All UEFI platforms are little endian #define le32toh(x) (x)
#define ACPI_SPECFLAG_PREFETCHABLE 0x06
2.5.0