* [KJ][PATCH] ROUND_UP macro cleanup in drivers/net/e1000
2007-04-01 11:26 ` [KJ] [PATCH] " Milind Arun Choudhary
@ 2007-04-01 18:43 ` Milind Arun Choudhary
-1 siblings, 0 replies; 8+ messages in thread
From: Milind Arun Choudhary @ 2007-04-01 18:31 UTC (permalink / raw)
To: kernel-janitors, e1000-devel, linux.nics
Cc: linux-kernel, akpm, cramerj, john.ronciak, jesse.brandeburg,
jeffrey.t.kirsher, auke-jan.h.kok
E1000_ROUNDUP macro cleanup, use ALIGN
Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com>
---
e1000.h | 3 ---
e1000_ethtool.c | 6 +++---
e1000_main.c | 10 +++++-----
e1000_param.c | 4 ++--
4 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index dd4b728..a9ea67e 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -155,9 +155,6 @@ struct e1000_adapter;
/* Number of packet split data buffers (not including the header buffer) */
#define PS_PAGE_BUFFERS MAX_PS_BUFFERS-1
-/* only works for sizes that are powers of 2 */
-#define E1000_ROUNDUP(i, size) ((i) = (((i) + (size) - 1) & ~((size) - 1)))
-
/* wrapper around a pointer to a socket buffer,
* so a DMA handle can be stored along with the buffer */
struct e1000_buffer {
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 6777887..0fbd873 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -686,12 +686,12 @@ e1000_set_ringparam(struct net_device *netdev,
rxdr->count = max(ring->rx_pending,(uint32_t)E1000_MIN_RXD);
rxdr->count = min(rxdr->count,(uint32_t)(mac_type < e1000_82544 ?
E1000_MAX_RXD : E1000_MAX_82544_RXD));
- E1000_ROUNDUP(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE);
+ rxdr->count = ALIGN(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE);
txdr->count = max(ring->tx_pending,(uint32_t)E1000_MIN_TXD);
txdr->count = min(txdr->count,(uint32_t)(mac_type < e1000_82544 ?
E1000_MAX_TXD : E1000_MAX_82544_TXD));
- E1000_ROUNDUP(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE);
+ txdr->count = ALIGN(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE);
for (i = 0; i < adapter->num_tx_queues; i++)
txdr[i].count = txdr->count;
@@ -1068,7 +1068,7 @@ e1000_setup_desc_rings(struct e1000_adapter *adapter)
memset(txdr->buffer_info, 0, size);
txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
- E1000_ROUNDUP(txdr->size, 4096);
+ txdr->size = ALIGN(txdr->size, 4096);
if (!(txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma))) {
ret_val = 2;
goto err_nomem;
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 1d08e93..d0af100 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -750,9 +750,9 @@ e1000_reset(struct e1000_adapter *adapter)
VLAN_TAG_SIZE;
min_tx_space = min_rx_space;
min_tx_space *= 2;
- E1000_ROUNDUP(min_tx_space, 1024);
+ min_tx_space = ALIGN(min_tx_space, 1024);
min_tx_space >>= 10;
- E1000_ROUNDUP(min_rx_space, 1024);
+ min_rx_space = ALIGN(min_rx_space, 1024);
min_rx_space >>= 10;
/* If current Tx allocation is less than the min Tx FIFO size,
@@ -1545,7 +1545,7 @@ e1000_setup_tx_resources(struct e1000_adapter *adapter,
/* round up to nearest 4K */
txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
- E1000_ROUNDUP(txdr->size, 4096);
+ txdr->size = ALIGN(txdr->size, 4096);
txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma);
if (!txdr->desc) {
@@ -1788,7 +1788,7 @@ e1000_setup_rx_resources(struct e1000_adapter *adapter,
/* Round up to nearest 4K */
rxdr->size = rxdr->count * desc_len;
- E1000_ROUNDUP(rxdr->size, 4096);
+ rxdr->size = ALIGN(rxdr->size, 4096);
rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma);
@@ -3162,7 +3162,7 @@ e1000_82547_fifo_workaround(struct e1000_adapter *adapter, struct sk_buff *skb)
uint32_t fifo_space = adapter->tx_fifo_size - adapter->tx_fifo_head;
uint32_t skb_fifo_len = skb->len + E1000_FIFO_HDR;
- E1000_ROUNDUP(skb_fifo_len, E1000_FIFO_HDR);
+ skb_fifo_len = ALIGN(skb_fifo_len, E1000_FIFO_HDR);
if (adapter->link_duplex != HALF_DUPLEX)
goto no_fifo_stall_required;
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
index f8862e2..f485874 100644
--- a/drivers/net/e1000/e1000_param.c
+++ b/drivers/net/e1000/e1000_param.c
@@ -305,7 +305,7 @@ e1000_check_options(struct e1000_adapter *adapter)
if (num_TxDescriptors > bd) {
tx_ring->count = TxDescriptors[bd];
e1000_validate_option(&tx_ring->count, &opt, adapter);
- E1000_ROUNDUP(tx_ring->count,
+ tx_ring->count = ALIGN(tx_ring->count,
REQ_TX_DESCRIPTOR_MULTIPLE);
} else {
tx_ring->count = opt.def;
@@ -331,7 +331,7 @@ e1000_check_options(struct e1000_adapter *adapter)
if (num_RxDescriptors > bd) {
rx_ring->count = RxDescriptors[bd];
e1000_validate_option(&rx_ring->count, &opt, adapter);
- E1000_ROUNDUP(rx_ring->count,
+ rx_ring->count = ALIGN(rx_ring->count,
REQ_RX_DESCRIPTOR_MULTIPLE);
} else {
rx_ring->count = opt.def;
--
Milind Arun Choudhary
^ permalink raw reply related [flat|nested] 8+ messages in thread* [KJ] [PATCH] ROUND_UP macro cleanup in drivers/net/e1000
@ 2007-04-01 18:43 ` Milind Arun Choudhary
0 siblings, 0 replies; 8+ messages in thread
From: Milind Arun Choudhary @ 2007-04-01 18:43 UTC (permalink / raw)
To: kernel-janitors, e1000-devel, linux.nics
Cc: linux-kernel, akpm, cramerj, john.ronciak, jesse.brandeburg,
jeffrey.t.kirsher, auke-jan.h.kok
E1000_ROUNDUP macro cleanup, use ALIGN
Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com>
---
e1000.h | 3 ---
e1000_ethtool.c | 6 +++---
e1000_main.c | 10 +++++-----
e1000_param.c | 4 ++--
4 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index dd4b728..a9ea67e 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -155,9 +155,6 @@ struct e1000_adapter;
/* Number of packet split data buffers (not including the header buffer) */
#define PS_PAGE_BUFFERS MAX_PS_BUFFERS-1
-/* only works for sizes that are powers of 2 */
-#define E1000_ROUNDUP(i, size) ((i) = (((i) + (size) - 1) & ~((size) - 1)))
-
/* wrapper around a pointer to a socket buffer,
* so a DMA handle can be stored along with the buffer */
struct e1000_buffer {
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 6777887..0fbd873 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -686,12 +686,12 @@ e1000_set_ringparam(struct net_device *netdev,
rxdr->count = max(ring->rx_pending,(uint32_t)E1000_MIN_RXD);
rxdr->count = min(rxdr->count,(uint32_t)(mac_type < e1000_82544 ?
E1000_MAX_RXD : E1000_MAX_82544_RXD));
- E1000_ROUNDUP(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE);
+ rxdr->count = ALIGN(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE);
txdr->count = max(ring->tx_pending,(uint32_t)E1000_MIN_TXD);
txdr->count = min(txdr->count,(uint32_t)(mac_type < e1000_82544 ?
E1000_MAX_TXD : E1000_MAX_82544_TXD));
- E1000_ROUNDUP(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE);
+ txdr->count = ALIGN(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE);
for (i = 0; i < adapter->num_tx_queues; i++)
txdr[i].count = txdr->count;
@@ -1068,7 +1068,7 @@ e1000_setup_desc_rings(struct e1000_adapter *adapter)
memset(txdr->buffer_info, 0, size);
txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
- E1000_ROUNDUP(txdr->size, 4096);
+ txdr->size = ALIGN(txdr->size, 4096);
if (!(txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma))) {
ret_val = 2;
goto err_nomem;
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 1d08e93..d0af100 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -750,9 +750,9 @@ e1000_reset(struct e1000_adapter *adapter)
VLAN_TAG_SIZE;
min_tx_space = min_rx_space;
min_tx_space *= 2;
- E1000_ROUNDUP(min_tx_space, 1024);
+ min_tx_space = ALIGN(min_tx_space, 1024);
min_tx_space >>= 10;
- E1000_ROUNDUP(min_rx_space, 1024);
+ min_rx_space = ALIGN(min_rx_space, 1024);
min_rx_space >>= 10;
/* If current Tx allocation is less than the min Tx FIFO size,
@@ -1545,7 +1545,7 @@ e1000_setup_tx_resources(struct e1000_adapter *adapter,
/* round up to nearest 4K */
txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
- E1000_ROUNDUP(txdr->size, 4096);
+ txdr->size = ALIGN(txdr->size, 4096);
txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma);
if (!txdr->desc) {
@@ -1788,7 +1788,7 @@ e1000_setup_rx_resources(struct e1000_adapter *adapter,
/* Round up to nearest 4K */
rxdr->size = rxdr->count * desc_len;
- E1000_ROUNDUP(rxdr->size, 4096);
+ rxdr->size = ALIGN(rxdr->size, 4096);
rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma);
@@ -3162,7 +3162,7 @@ e1000_82547_fifo_workaround(struct e1000_adapter *adapter, struct sk_buff *skb)
uint32_t fifo_space = adapter->tx_fifo_size - adapter->tx_fifo_head;
uint32_t skb_fifo_len = skb->len + E1000_FIFO_HDR;
- E1000_ROUNDUP(skb_fifo_len, E1000_FIFO_HDR);
+ skb_fifo_len = ALIGN(skb_fifo_len, E1000_FIFO_HDR);
if (adapter->link_duplex != HALF_DUPLEX)
goto no_fifo_stall_required;
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
index f8862e2..f485874 100644
--- a/drivers/net/e1000/e1000_param.c
+++ b/drivers/net/e1000/e1000_param.c
@@ -305,7 +305,7 @@ e1000_check_options(struct e1000_adapter *adapter)
if (num_TxDescriptors > bd) {
tx_ring->count = TxDescriptors[bd];
e1000_validate_option(&tx_ring->count, &opt, adapter);
- E1000_ROUNDUP(tx_ring->count,
+ tx_ring->count = ALIGN(tx_ring->count,
REQ_TX_DESCRIPTOR_MULTIPLE);
} else {
tx_ring->count = opt.def;
@@ -331,7 +331,7 @@ e1000_check_options(struct e1000_adapter *adapter)
if (num_RxDescriptors > bd) {
rx_ring->count = RxDescriptors[bd];
e1000_validate_option(&rx_ring->count, &opt, adapter);
- E1000_ROUNDUP(rx_ring->count,
+ rx_ring->count = ALIGN(rx_ring->count,
REQ_RX_DESCRIPTOR_MULTIPLE);
} else {
rx_ring->count = opt.def;
--
Milind Arun Choudhary
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [KJ] [PATCH] ROUND_UP macro cleanup in drivers/net/e1000
2007-04-01 18:43 ` [KJ] [PATCH] " Milind Arun Choudhary
@ 2007-04-01 23:20 ` Kok, Auke
-1 siblings, 0 replies; 8+ messages in thread
From: Kok, Auke @ 2007-04-01 23:20 UTC (permalink / raw)
To: Milind Arun Choudhary
Cc: kernel-janitors, e1000-devel, linux.nics, linux-kernel, akpm,
cramerj, john.ronciak, jesse.brandeburg, jeffrey.t.kirsher
Milind Arun Choudhary wrote:
> E1000_ROUNDUP macro cleanup, use ALIGN
>
> Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com>
we were actually looking at this last week. I'll take it for a spin and if it's
good I'll push it through upstream.
Thanks!
Auke
> ---
>
> e1000.h | 3 ---
> e1000_ethtool.c | 6 +++---
> e1000_main.c | 10 +++++-----
> e1000_param.c | 4 ++--
> 4 files changed, 10 insertions(+), 13 deletions(-)
>
>
> diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
> index dd4b728..a9ea67e 100644
> --- a/drivers/net/e1000/e1000.h
> +++ b/drivers/net/e1000/e1000.h
> @@ -155,9 +155,6 @@ struct e1000_adapter;
> /* Number of packet split data buffers (not including the header buffer) */
> #define PS_PAGE_BUFFERS MAX_PS_BUFFERS-1
>
> -/* only works for sizes that are powers of 2 */
> -#define E1000_ROUNDUP(i, size) ((i) = (((i) + (size) - 1) & ~((size) - 1)))
> -
> /* wrapper around a pointer to a socket buffer,
> * so a DMA handle can be stored along with the buffer */
> struct e1000_buffer {
> diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
> index 6777887..0fbd873 100644
> --- a/drivers/net/e1000/e1000_ethtool.c
> +++ b/drivers/net/e1000/e1000_ethtool.c
> @@ -686,12 +686,12 @@ e1000_set_ringparam(struct net_device *netdev,
> rxdr->count = max(ring->rx_pending,(uint32_t)E1000_MIN_RXD);
> rxdr->count = min(rxdr->count,(uint32_t)(mac_type < e1000_82544 ?
> E1000_MAX_RXD : E1000_MAX_82544_RXD));
> - E1000_ROUNDUP(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE);
> + rxdr->count = ALIGN(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE);
>
> txdr->count = max(ring->tx_pending,(uint32_t)E1000_MIN_TXD);
> txdr->count = min(txdr->count,(uint32_t)(mac_type < e1000_82544 ?
> E1000_MAX_TXD : E1000_MAX_82544_TXD));
> - E1000_ROUNDUP(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE);
> + txdr->count = ALIGN(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE);
>
> for (i = 0; i < adapter->num_tx_queues; i++)
> txdr[i].count = txdr->count;
> @@ -1068,7 +1068,7 @@ e1000_setup_desc_rings(struct e1000_adapter *adapter)
> memset(txdr->buffer_info, 0, size);
>
> txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
> - E1000_ROUNDUP(txdr->size, 4096);
> + txdr->size = ALIGN(txdr->size, 4096);
> if (!(txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma))) {
> ret_val = 2;
> goto err_nomem;
> diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
> index 1d08e93..d0af100 100644
> --- a/drivers/net/e1000/e1000_main.c
> +++ b/drivers/net/e1000/e1000_main.c
> @@ -750,9 +750,9 @@ e1000_reset(struct e1000_adapter *adapter)
> VLAN_TAG_SIZE;
> min_tx_space = min_rx_space;
> min_tx_space *= 2;
> - E1000_ROUNDUP(min_tx_space, 1024);
> + min_tx_space = ALIGN(min_tx_space, 1024);
> min_tx_space >>= 10;
> - E1000_ROUNDUP(min_rx_space, 1024);
> + min_rx_space = ALIGN(min_rx_space, 1024);
> min_rx_space >>= 10;
>
> /* If current Tx allocation is less than the min Tx FIFO size,
> @@ -1545,7 +1545,7 @@ e1000_setup_tx_resources(struct e1000_adapter *adapter,
> /* round up to nearest 4K */
>
> txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
> - E1000_ROUNDUP(txdr->size, 4096);
> + txdr->size = ALIGN(txdr->size, 4096);
>
> txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma);
> if (!txdr->desc) {
> @@ -1788,7 +1788,7 @@ e1000_setup_rx_resources(struct e1000_adapter *adapter,
> /* Round up to nearest 4K */
>
> rxdr->size = rxdr->count * desc_len;
> - E1000_ROUNDUP(rxdr->size, 4096);
> + rxdr->size = ALIGN(rxdr->size, 4096);
>
> rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma);
>
> @@ -3162,7 +3162,7 @@ e1000_82547_fifo_workaround(struct e1000_adapter *adapter, struct sk_buff *skb)
> uint32_t fifo_space = adapter->tx_fifo_size - adapter->tx_fifo_head;
> uint32_t skb_fifo_len = skb->len + E1000_FIFO_HDR;
>
> - E1000_ROUNDUP(skb_fifo_len, E1000_FIFO_HDR);
> + skb_fifo_len = ALIGN(skb_fifo_len, E1000_FIFO_HDR);
>
> if (adapter->link_duplex != HALF_DUPLEX)
> goto no_fifo_stall_required;
> diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
> index f8862e2..f485874 100644
> --- a/drivers/net/e1000/e1000_param.c
> +++ b/drivers/net/e1000/e1000_param.c
> @@ -305,7 +305,7 @@ e1000_check_options(struct e1000_adapter *adapter)
> if (num_TxDescriptors > bd) {
> tx_ring->count = TxDescriptors[bd];
> e1000_validate_option(&tx_ring->count, &opt, adapter);
> - E1000_ROUNDUP(tx_ring->count,
> + tx_ring->count = ALIGN(tx_ring->count,
> REQ_TX_DESCRIPTOR_MULTIPLE);
> } else {
> tx_ring->count = opt.def;
> @@ -331,7 +331,7 @@ e1000_check_options(struct e1000_adapter *adapter)
> if (num_RxDescriptors > bd) {
> rx_ring->count = RxDescriptors[bd];
> e1000_validate_option(&rx_ring->count, &opt, adapter);
> - E1000_ROUNDUP(rx_ring->count,
> + rx_ring->count = ALIGN(rx_ring->count,
> REQ_RX_DESCRIPTOR_MULTIPLE);
> } else {
> rx_ring->count = opt.def;
>
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [KJ][PATCH] ROUND_UP macro cleanup in drivers/net/e1000
@ 2007-04-01 23:20 ` Kok, Auke
0 siblings, 0 replies; 8+ messages in thread
From: Kok, Auke @ 2007-04-01 23:20 UTC (permalink / raw)
To: Milind Arun Choudhary
Cc: kernel-janitors, e1000-devel, linux.nics, linux-kernel, akpm,
cramerj, john.ronciak, jesse.brandeburg, jeffrey.t.kirsher
Milind Arun Choudhary wrote:
> E1000_ROUNDUP macro cleanup, use ALIGN
>
> Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com>
we were actually looking at this last week. I'll take it for a spin and if it's
good I'll push it through upstream.
Thanks!
Auke
> ---
>
> e1000.h | 3 ---
> e1000_ethtool.c | 6 +++---
> e1000_main.c | 10 +++++-----
> e1000_param.c | 4 ++--
> 4 files changed, 10 insertions(+), 13 deletions(-)
>
>
> diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
> index dd4b728..a9ea67e 100644
> --- a/drivers/net/e1000/e1000.h
> +++ b/drivers/net/e1000/e1000.h
> @@ -155,9 +155,6 @@ struct e1000_adapter;
> /* Number of packet split data buffers (not including the header buffer) */
> #define PS_PAGE_BUFFERS MAX_PS_BUFFERS-1
>
> -/* only works for sizes that are powers of 2 */
> -#define E1000_ROUNDUP(i, size) ((i) = (((i) + (size) - 1) & ~((size) - 1)))
> -
> /* wrapper around a pointer to a socket buffer,
> * so a DMA handle can be stored along with the buffer */
> struct e1000_buffer {
> diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
> index 6777887..0fbd873 100644
> --- a/drivers/net/e1000/e1000_ethtool.c
> +++ b/drivers/net/e1000/e1000_ethtool.c
> @@ -686,12 +686,12 @@ e1000_set_ringparam(struct net_device *netdev,
> rxdr->count = max(ring->rx_pending,(uint32_t)E1000_MIN_RXD);
> rxdr->count = min(rxdr->count,(uint32_t)(mac_type < e1000_82544 ?
> E1000_MAX_RXD : E1000_MAX_82544_RXD));
> - E1000_ROUNDUP(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE);
> + rxdr->count = ALIGN(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE);
>
> txdr->count = max(ring->tx_pending,(uint32_t)E1000_MIN_TXD);
> txdr->count = min(txdr->count,(uint32_t)(mac_type < e1000_82544 ?
> E1000_MAX_TXD : E1000_MAX_82544_TXD));
> - E1000_ROUNDUP(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE);
> + txdr->count = ALIGN(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE);
>
> for (i = 0; i < adapter->num_tx_queues; i++)
> txdr[i].count = txdr->count;
> @@ -1068,7 +1068,7 @@ e1000_setup_desc_rings(struct e1000_adapter *adapter)
> memset(txdr->buffer_info, 0, size);
>
> txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
> - E1000_ROUNDUP(txdr->size, 4096);
> + txdr->size = ALIGN(txdr->size, 4096);
> if (!(txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma))) {
> ret_val = 2;
> goto err_nomem;
> diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
> index 1d08e93..d0af100 100644
> --- a/drivers/net/e1000/e1000_main.c
> +++ b/drivers/net/e1000/e1000_main.c
> @@ -750,9 +750,9 @@ e1000_reset(struct e1000_adapter *adapter)
> VLAN_TAG_SIZE;
> min_tx_space = min_rx_space;
> min_tx_space *= 2;
> - E1000_ROUNDUP(min_tx_space, 1024);
> + min_tx_space = ALIGN(min_tx_space, 1024);
> min_tx_space >>= 10;
> - E1000_ROUNDUP(min_rx_space, 1024);
> + min_rx_space = ALIGN(min_rx_space, 1024);
> min_rx_space >>= 10;
>
> /* If current Tx allocation is less than the min Tx FIFO size,
> @@ -1545,7 +1545,7 @@ e1000_setup_tx_resources(struct e1000_adapter *adapter,
> /* round up to nearest 4K */
>
> txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
> - E1000_ROUNDUP(txdr->size, 4096);
> + txdr->size = ALIGN(txdr->size, 4096);
>
> txdr->desc = pci_alloc_consistent(pdev, txdr->size, &txdr->dma);
> if (!txdr->desc) {
> @@ -1788,7 +1788,7 @@ e1000_setup_rx_resources(struct e1000_adapter *adapter,
> /* Round up to nearest 4K */
>
> rxdr->size = rxdr->count * desc_len;
> - E1000_ROUNDUP(rxdr->size, 4096);
> + rxdr->size = ALIGN(rxdr->size, 4096);
>
> rxdr->desc = pci_alloc_consistent(pdev, rxdr->size, &rxdr->dma);
>
> @@ -3162,7 +3162,7 @@ e1000_82547_fifo_workaround(struct e1000_adapter *adapter, struct sk_buff *skb)
> uint32_t fifo_space = adapter->tx_fifo_size - adapter->tx_fifo_head;
> uint32_t skb_fifo_len = skb->len + E1000_FIFO_HDR;
>
> - E1000_ROUNDUP(skb_fifo_len, E1000_FIFO_HDR);
> + skb_fifo_len = ALIGN(skb_fifo_len, E1000_FIFO_HDR);
>
> if (adapter->link_duplex != HALF_DUPLEX)
> goto no_fifo_stall_required;
> diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
> index f8862e2..f485874 100644
> --- a/drivers/net/e1000/e1000_param.c
> +++ b/drivers/net/e1000/e1000_param.c
> @@ -305,7 +305,7 @@ e1000_check_options(struct e1000_adapter *adapter)
> if (num_TxDescriptors > bd) {
> tx_ring->count = TxDescriptors[bd];
> e1000_validate_option(&tx_ring->count, &opt, adapter);
> - E1000_ROUNDUP(tx_ring->count,
> + tx_ring->count = ALIGN(tx_ring->count,
> REQ_TX_DESCRIPTOR_MULTIPLE);
> } else {
> tx_ring->count = opt.def;
> @@ -331,7 +331,7 @@ e1000_check_options(struct e1000_adapter *adapter)
> if (num_RxDescriptors > bd) {
> rx_ring->count = RxDescriptors[bd];
> e1000_validate_option(&rx_ring->count, &opt, adapter);
> - E1000_ROUNDUP(rx_ring->count,
> + rx_ring->count = ALIGN(rx_ring->count,
> REQ_RX_DESCRIPTOR_MULTIPLE);
> } else {
> rx_ring->count = opt.def;
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [KJ][PATCH] ROUND_UP macro cleanup in drivers/pci
@ 2007-04-01 11:26 ` Milind Arun Choudhary
0 siblings, 0 replies; 8+ messages in thread
From: Milind Arun Choudhary @ 2007-04-01 11:14 UTC (permalink / raw)
To: kernel-janitors; +Cc: linux-kernel, akpm, pcihpd-discuss, scottm, linux-pci
ROUND_UP macro cleanup, use ALIGN where ever appropriate
Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com>
---
hotplug/cpci_hotplug_pci.c | 2 --
setup-bus.c | 8 +++-----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/pci/hotplug/cpci_hotplug_pci.c b/drivers/pci/hotplug/cpci_hotplug_pci.c
index 7b1beaa..5e9be44 100644
--- a/drivers/pci/hotplug/cpci_hotplug_pci.c
+++ b/drivers/pci/hotplug/cpci_hotplug_pci.c
@@ -45,8 +45,6 @@ extern int cpci_debug;
#define info(format, arg...) printk(KERN_INFO "%s: " format "\n", MY_NAME , ## arg)
#define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg)
-#define ROUND_UP(x, a) (((x) + (a) - 1) & ~((a) - 1))
-
u8 cpci_get_attention_status(struct slot* slot)
{
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 3554f39..e02766f 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -34,8 +34,6 @@
#define DBG(x...)
#endif
-#define ROUND_UP(x, a) (((x) + (a) - 1) & ~((a) - 1))
-
static void __devinit
pbus_assign_resources_sorted(struct pci_bus *bus)
{
@@ -314,7 +312,7 @@ pbus_size_io(struct pci_bus *bus)
#if defined(CONFIG_ISA) || defined(CONFIG_EISA)
size = (size & 0xff) + ((size & ~0xffUL) << 2);
#endif
- size = ROUND_UP(size + size1, 4096);
+ size = ALIGN(size + size1, 4096);
if (!size) {
b_res->flags = 0;
return;
@@ -383,11 +381,11 @@ pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long type)
if (!align)
min_align = align1;
- else if (ROUND_UP(align + min_align, min_align) < align1)
+ else if (ALIGN(align + min_align, min_align) < align1)
min_align = align1 >> 1;
align += aligns[order];
}
- size = ROUND_UP(size, min_align);
+ size = ALIGN(size, min_align);
if (!size) {
b_res->flags = 0;
return 1;
--
Milind Arun Choudhary
^ permalink raw reply related [flat|nested] 8+ messages in thread* [KJ] [PATCH] ROUND_UP macro cleanup in drivers/pci
@ 2007-04-01 11:26 ` Milind Arun Choudhary
0 siblings, 0 replies; 8+ messages in thread
From: Milind Arun Choudhary @ 2007-04-01 11:26 UTC (permalink / raw)
To: kernel-janitors; +Cc: linux-kernel, akpm, pcihpd-discuss, scottm, linux-pci
ROUND_UP macro cleanup, use ALIGN where ever appropriate
Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com>
---
hotplug/cpci_hotplug_pci.c | 2 --
setup-bus.c | 8 +++-----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/pci/hotplug/cpci_hotplug_pci.c b/drivers/pci/hotplug/cpci_hotplug_pci.c
index 7b1beaa..5e9be44 100644
--- a/drivers/pci/hotplug/cpci_hotplug_pci.c
+++ b/drivers/pci/hotplug/cpci_hotplug_pci.c
@@ -45,8 +45,6 @@ extern int cpci_debug;
#define info(format, arg...) printk(KERN_INFO "%s: " format "\n", MY_NAME , ## arg)
#define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg)
-#define ROUND_UP(x, a) (((x) + (a) - 1) & ~((a) - 1))
-
u8 cpci_get_attention_status(struct slot* slot)
{
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 3554f39..e02766f 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -34,8 +34,6 @@
#define DBG(x...)
#endif
-#define ROUND_UP(x, a) (((x) + (a) - 1) & ~((a) - 1))
-
static void __devinit
pbus_assign_resources_sorted(struct pci_bus *bus)
{
@@ -314,7 +312,7 @@ pbus_size_io(struct pci_bus *bus)
#if defined(CONFIG_ISA) || defined(CONFIG_EISA)
size = (size & 0xff) + ((size & ~0xffUL) << 2);
#endif
- size = ROUND_UP(size + size1, 4096);
+ size = ALIGN(size + size1, 4096);
if (!size) {
b_res->flags = 0;
return;
@@ -383,11 +381,11 @@ pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long type)
if (!align)
min_align = align1;
- else if (ROUND_UP(align + min_align, min_align) < align1)
+ else if (ALIGN(align + min_align, min_align) < align1)
min_align = align1 >> 1;
align += aligns[order];
}
- size = ROUND_UP(size, min_align);
+ size = ALIGN(size, min_align);
if (!size) {
b_res->flags = 0;
return 1;
--
Milind Arun Choudhary
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [KJ] [PATCH] ROUND_UP macro cleanup in drivers/pci
2007-04-01 11:26 ` [KJ] [PATCH] " Milind Arun Choudhary
@ 2007-04-04 17:59 ` Scott Murray
-1 siblings, 0 replies; 8+ messages in thread
From: Scott Murray @ 2007-04-04 17:59 UTC (permalink / raw)
To: Milind Arun Choudhary
Cc: kernel-janitors, linux-kernel, akpm, pcihpd-discuss, linux-pci
On Sun, 1 Apr 2007, Milind Arun Choudhary wrote:
>
> ROUND_UP macro cleanup, use ALIGN where ever appropriate
>
> Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com>
Ack for the hotplug/cpci_hotplug_pci.c change, looks like I missed
removing that define back when I originally reworked things for 2.6.
The setup-bus.c change looks okay to me as well, but probably needs
sign-off from Greg.
Signed-off-by: Scott Murray <scottm@somanetworks.com>
> ---
> hotplug/cpci_hotplug_pci.c | 2 --
> setup-bus.c | 8 +++-----
> 2 files changed, 3 insertions(+), 7 deletions(-)
>
>
> diff --git a/drivers/pci/hotplug/cpci_hotplug_pci.c b/drivers/pci/hotplug/cpci_hotplug_pci.c
> index 7b1beaa..5e9be44 100644
> --- a/drivers/pci/hotplug/cpci_hotplug_pci.c
> +++ b/drivers/pci/hotplug/cpci_hotplug_pci.c
> @@ -45,8 +45,6 @@ extern int cpci_debug;
> #define info(format, arg...) printk(KERN_INFO "%s: " format "\n", MY_NAME , ## arg)
> #define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg)
>
> -#define ROUND_UP(x, a) (((x) + (a) - 1) & ~((a) - 1))
> -
>
> u8 cpci_get_attention_status(struct slot* slot)
> {
> diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
> index 3554f39..e02766f 100644
> --- a/drivers/pci/setup-bus.c
> +++ b/drivers/pci/setup-bus.c
> @@ -34,8 +34,6 @@
> #define DBG(x...)
> #endif
>
> -#define ROUND_UP(x, a) (((x) + (a) - 1) & ~((a) - 1))
> -
> static void __devinit
> pbus_assign_resources_sorted(struct pci_bus *bus)
> {
> @@ -314,7 +312,7 @@ pbus_size_io(struct pci_bus *bus)
> #if defined(CONFIG_ISA) || defined(CONFIG_EISA)
> size = (size & 0xff) + ((size & ~0xffUL) << 2);
> #endif
> - size = ROUND_UP(size + size1, 4096);
> + size = ALIGN(size + size1, 4096);
> if (!size) {
> b_res->flags = 0;
> return;
> @@ -383,11 +381,11 @@ pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long type)
>
> if (!align)
> min_align = align1;
> - else if (ROUND_UP(align + min_align, min_align) < align1)
> + else if (ALIGN(align + min_align, min_align) < align1)
> min_align = align1 >> 1;
> align += aligns[order];
> }
> - size = ROUND_UP(size, min_align);
> + size = ALIGN(size, min_align);
> if (!size) {
> b_res->flags = 0;
> return 1;
>
> --
> Milind Arun Choudhary
>
--
Scott Murray
SOMA Networks, Inc.
Toronto, Ontario
e-mail: scottm@somanetworks.com
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [KJ][PATCH] ROUND_UP macro cleanup in drivers/pci
@ 2007-04-04 17:59 ` Scott Murray
0 siblings, 0 replies; 8+ messages in thread
From: Scott Murray @ 2007-04-04 17:59 UTC (permalink / raw)
To: Milind Arun Choudhary
Cc: kernel-janitors, linux-kernel, akpm, pcihpd-discuss, linux-pci
On Sun, 1 Apr 2007, Milind Arun Choudhary wrote:
>
> ROUND_UP macro cleanup, use ALIGN where ever appropriate
>
> Signed-off-by: Milind Arun Choudhary <milindchoudhary@gmail.com>
Ack for the hotplug/cpci_hotplug_pci.c change, looks like I missed
removing that define back when I originally reworked things for 2.6.
The setup-bus.c change looks okay to me as well, but probably needs
sign-off from Greg.
Signed-off-by: Scott Murray <scottm@somanetworks.com>
> ---
> hotplug/cpci_hotplug_pci.c | 2 --
> setup-bus.c | 8 +++-----
> 2 files changed, 3 insertions(+), 7 deletions(-)
>
>
> diff --git a/drivers/pci/hotplug/cpci_hotplug_pci.c b/drivers/pci/hotplug/cpci_hotplug_pci.c
> index 7b1beaa..5e9be44 100644
> --- a/drivers/pci/hotplug/cpci_hotplug_pci.c
> +++ b/drivers/pci/hotplug/cpci_hotplug_pci.c
> @@ -45,8 +45,6 @@ extern int cpci_debug;
> #define info(format, arg...) printk(KERN_INFO "%s: " format "\n", MY_NAME , ## arg)
> #define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg)
>
> -#define ROUND_UP(x, a) (((x) + (a) - 1) & ~((a) - 1))
> -
>
> u8 cpci_get_attention_status(struct slot* slot)
> {
> diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
> index 3554f39..e02766f 100644
> --- a/drivers/pci/setup-bus.c
> +++ b/drivers/pci/setup-bus.c
> @@ -34,8 +34,6 @@
> #define DBG(x...)
> #endif
>
> -#define ROUND_UP(x, a) (((x) + (a) - 1) & ~((a) - 1))
> -
> static void __devinit
> pbus_assign_resources_sorted(struct pci_bus *bus)
> {
> @@ -314,7 +312,7 @@ pbus_size_io(struct pci_bus *bus)
> #if defined(CONFIG_ISA) || defined(CONFIG_EISA)
> size = (size & 0xff) + ((size & ~0xffUL) << 2);
> #endif
> - size = ROUND_UP(size + size1, 4096);
> + size = ALIGN(size + size1, 4096);
> if (!size) {
> b_res->flags = 0;
> return;
> @@ -383,11 +381,11 @@ pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long type)
>
> if (!align)
> min_align = align1;
> - else if (ROUND_UP(align + min_align, min_align) < align1)
> + else if (ALIGN(align + min_align, min_align) < align1)
> min_align = align1 >> 1;
> align += aligns[order];
> }
> - size = ROUND_UP(size, min_align);
> + size = ALIGN(size, min_align);
> if (!size) {
> b_res->flags = 0;
> return 1;
>
> --
> Milind Arun Choudhary
>
--
Scott Murray
SOMA Networks, Inc.
Toronto, Ontario
e-mail: scottm@somanetworks.com
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2007-04-04 18:07 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-04-01 18:31 [KJ][PATCH] ROUND_UP macro cleanup in drivers/net/e1000 Milind Arun Choudhary
2007-04-01 18:43 ` [KJ] [PATCH] " Milind Arun Choudhary
2007-04-01 23:20 ` Kok, Auke
2007-04-01 23:20 ` [KJ][PATCH] " Kok, Auke
-- strict thread matches above, loose matches on Subject: below --
2007-04-01 11:14 [KJ][PATCH] ROUND_UP macro cleanup in drivers/pci Milind Arun Choudhary
2007-04-01 11:26 ` [KJ] [PATCH] " Milind Arun Choudhary
2007-04-04 17:59 ` Scott Murray
2007-04-04 17:59 ` [KJ][PATCH] " Scott Murray
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.