[PATCH] Revert "firewire: ohci: use common macro to interpret be32 data in le32 buffer"

[PATCH] Revert "firewire: ohci: use common macro to interpret be32 data in le32 buffer"

[Takashi Sakamoto]

This reverts commit f26a38e61c03fdfacb6b596e1daf665cf4526a60, since it
causes the following sparse warnings:

sparse warnings: (new ones prefixed by >>)
>> drivers/firewire/ohci.c:891:23: sparse: sparse: cast to restricted __be32
>> drivers/firewire/ohci.c:891:23: sparse: sparse: cast from restricted __le32
   drivers/firewire/ohci.c:892:23: sparse: sparse: cast to restricted __be32
   drivers/firewire/ohci.c:892:23: sparse: sparse: cast from restricted __le32
   drivers/firewire/ohci.c:893:23: sparse: sparse: cast to restricted __be32
   drivers/firewire/ohci.c:893:23: sparse: sparse: cast from restricted __le32
   drivers/firewire/ohci.c:905:31: sparse: sparse: cast to restricted __be32
   drivers/firewire/ohci.c:905:31: sparse: sparse: cast from restricted __le32
   drivers/firewire/ohci.c:914:31: sparse: sparse: cast to restricted __be32
   drivers/firewire/ohci.c:914:31: sparse: sparse: cast from restricted __le32
   drivers/firewire/ohci.c:939:18: sparse: sparse: cast to restricted __be32
   drivers/firewire/ohci.c:939:18: sparse: sparse: cast from restricted __le32
   drivers/firewire/ohci.c:2033:23: sparse: sparse: cast to restricted __be32
   drivers/firewire/ohci.c:2033:23: sparse: sparse: cast from restricted __le32
   drivers/firewire/ohci.c:2037:27: sparse: sparse: cast to restricted __be32
   drivers/firewire/ohci.c:2037:27: sparse: sparse: cast from restricted __le32
   drivers/firewire/ohci.c:2038:27: sparse: sparse: cast to restricted __be32
   drivers/firewire/ohci.c:2038:27: sparse: sparse: cast from restricted __le32

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202407050656.03bw1YXA-lkp@intel.com/
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---
 drivers/firewire/ohci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index f8d880574c19..314a29c0fd3e 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -879,7 +879,7 @@ static void ar_sync_buffers_for_cpu(struct ar_context *ctx,
 #if defined(CONFIG_PPC_PMAC) && defined(CONFIG_PPC32)
 static u32 cond_le32_to_cpu(__le32 value, bool has_be_header_quirk)
 {
-	return has_be_header_quirk ? be32_to_cpu(value) : le32_to_cpu(value);
+	return has_be_header_quirk ? (__force __u32)value : le32_to_cpu(value);
 }
 
 static bool has_be_header_quirk(const struct fw_ohci *ohci)
-- 
2.43.0

Re: [PATCH] Revert "firewire: ohci: use common macro to interpret be32 data in le32 buffer"

[Takashi Sakamoto]

On Sun, Jul 07, 2024 at 10:45:23PM +0900, Takashi Sakamoto wrote:
> This reverts commit f26a38e61c03fdfacb6b596e1daf665cf4526a60, since it
> causes the following sparse warnings:
> 
> sparse warnings: (new ones prefixed by >>)
> >> drivers/firewire/ohci.c:891:23: sparse: sparse: cast to restricted __be32
> >> drivers/firewire/ohci.c:891:23: sparse: sparse: cast from restricted __le32
>    drivers/firewire/ohci.c:892:23: sparse: sparse: cast to restricted __be32
>    drivers/firewire/ohci.c:892:23: sparse: sparse: cast from restricted __le32
>    drivers/firewire/ohci.c:893:23: sparse: sparse: cast to restricted __be32
>    drivers/firewire/ohci.c:893:23: sparse: sparse: cast from restricted __le32
>    drivers/firewire/ohci.c:905:31: sparse: sparse: cast to restricted __be32
>    drivers/firewire/ohci.c:905:31: sparse: sparse: cast from restricted __le32
>    drivers/firewire/ohci.c:914:31: sparse: sparse: cast to restricted __be32
>    drivers/firewire/ohci.c:914:31: sparse: sparse: cast from restricted __le32
>    drivers/firewire/ohci.c:939:18: sparse: sparse: cast to restricted __be32
>    drivers/firewire/ohci.c:939:18: sparse: sparse: cast from restricted __le32
>    drivers/firewire/ohci.c:2033:23: sparse: sparse: cast to restricted __be32
>    drivers/firewire/ohci.c:2033:23: sparse: sparse: cast from restricted __le32
>    drivers/firewire/ohci.c:2037:27: sparse: sparse: cast to restricted __be32
>    drivers/firewire/ohci.c:2037:27: sparse: sparse: cast from restricted __le32
>    drivers/firewire/ohci.c:2038:27: sparse: sparse: cast to restricted __be32
>    drivers/firewire/ohci.c:2038:27: sparse: sparse: cast from restricted __le32
> 
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202407050656.03bw1YXA-lkp@intel.com/
> Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
> ---
>  drivers/firewire/ohci.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to for-next branch.


Regards

Takashi Sakamoto