| Message ID | 20241218135930.2350358-1-edward.cree@amd.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 455e135c3042540cf15fff629a56600c11bea396 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] sfc: remove efx_writed_page_locked | expand |
From: Edward.cree <edward.cree@amd.com> Date: Wed, 18 Dec 2024 13:59:30 +0000 > From: Andy Moreton <andy.moreton@amd.com> > > From: Andy Moreton <andy.moreton@amd.com> The patch is fine, but here clearly should be only one "From:" line. > > efx_writed_page_locked is a workaround for Siena hardware that is not > needed on later adapters, and has no callers. Remove it. > > Signed-off-by: Andy Moreton <andy.moreton@amd.com> > Signed-off-by: Edward Cree <ecree.xilinx@gmail.com> > --- > drivers/net/ethernet/sfc/io.h | 24 ------------------------ > 1 file changed, 24 deletions(-) > > diff --git a/drivers/net/ethernet/sfc/io.h b/drivers/net/ethernet/sfc/io.h > index 4cc7b501135f..ef374a8e05c3 100644 > --- a/drivers/net/ethernet/sfc/io.h > +++ b/drivers/net/ethernet/sfc/io.h > @@ -217,28 +217,4 @@ _efx_writed_page(struct efx_nic *efx, const efx_dword_t *value, > (reg) != 0xa1c), \ > page) > > -/* Write TIMER_COMMAND. This is a page-mapped 32-bit CSR, but a bug > - * in the BIU means that writes to TIMER_COMMAND[0] invalidate the > - * collector register. > - */ > -static inline void _efx_writed_page_locked(struct efx_nic *efx, > - const efx_dword_t *value, > - unsigned int reg, > - unsigned int page) > -{ > - unsigned long flags __attribute__ ((unused)); > - > - if (page == 0) { > - spin_lock_irqsave(&efx->biu_lock, flags); > - efx_writed(efx, value, efx_paged_reg(efx, page, reg)); > - spin_unlock_irqrestore(&efx->biu_lock, flags); > - } else { > - efx_writed(efx, value, efx_paged_reg(efx, page, reg)); > - } > -} > -#define efx_writed_page_locked(efx, value, reg, page) \ > - _efx_writed_page_locked(efx, value, \ > - reg + BUILD_BUG_ON_ZERO((reg) != 0x420), \ > - page) > - > #endif /* EFX_IO_H */ Thanks, Olek
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 18 Dec 2024 13:59:30 +0000 you wrote: > From: Andy Moreton <andy.moreton@amd.com> > > From: Andy Moreton <andy.moreton@amd.com> > > efx_writed_page_locked is a workaround for Siena hardware that is not > needed on later adapters, and has no callers. Remove it. > > [...] Here is the summary with links: - [net-next] sfc: remove efx_writed_page_locked https://git.kernel.org/netdev/net-next/c/455e135c3042 You are awesome, thank you!
diff --git a/drivers/net/ethernet/sfc/io.h b/drivers/net/ethernet/sfc/io.h index 4cc7b501135f..ef374a8e05c3 100644 --- a/drivers/net/ethernet/sfc/io.h +++ b/drivers/net/ethernet/sfc/io.h @@ -217,28 +217,4 @@ _efx_writed_page(struct efx_nic *efx, const efx_dword_t *value, (reg) != 0xa1c), \ page) -/* Write TIMER_COMMAND. This is a page-mapped 32-bit CSR, but a bug - * in the BIU means that writes to TIMER_COMMAND[0] invalidate the - * collector register. - */ -static inline void _efx_writed_page_locked(struct efx_nic *efx, - const efx_dword_t *value, - unsigned int reg, - unsigned int page) -{ - unsigned long flags __attribute__ ((unused)); - - if (page == 0) { - spin_lock_irqsave(&efx->biu_lock, flags); - efx_writed(efx, value, efx_paged_reg(efx, page, reg)); - spin_unlock_irqrestore(&efx->biu_lock, flags); - } else { - efx_writed(efx, value, efx_paged_reg(efx, page, reg)); - } -} -#define efx_writed_page_locked(efx, value, reg, page) \ - _efx_writed_page_locked(efx, value, \ - reg + BUILD_BUG_ON_ZERO((reg) != 0x420), \ - page) - #endif /* EFX_IO_H */