Commit 853bede8 authored by Antoine Tenart's avatar Antoine Tenart Committed by David S. Miller
Browse files

net: phy: mscc: macsec: fix sparse warnings 



This patch fixes the following sparse warnings when building MACsec
support in the MSCC PHY driver.

  mscc_macsec.c:393:42: warning: cast from restricted sci_t
  mscc_macsec.c:395:42: warning: restricted sci_t degrades to integer
  mscc_macsec.c:402:42: warning: restricted __be16 degrades to integer
  mscc_macsec.c:608:34: warning: cast from restricted sci_t
  mscc_macsec.c:610:34: warning: restricted sci_t degrades to integer

Signed-off-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d0a45b5c

drivers/net/phy/mscc/mscc_macsec.c

+7 −5
Original line number Diff line number Diff line
@@ -385,21 +385,23 @@ static void vsc8584_macsec_flow(struct phy_device *phydev, 
	}



	if (bank == MACSEC_INGR && flow->match.sci && flow->rx_sa->sc->sci) {

		u64 sci = (__force u64)flow->rx_sa->sc->sci;



		match |= MSCC_MS_SAM_MISC_MATCH_TCI(BIT(3));

		mask |= MSCC_MS_SAM_MASK_TCI_MASK(BIT(3)) |

			MSCC_MS_SAM_MASK_SCI_MASK;



		vsc8584_macsec_phy_write(phydev, bank, MSCC_MS_SAM_MATCH_SCI_LO(idx),

					 lower_32_bits(flow->rx_sa->sc->sci));

					 lower_32_bits(sci));

		vsc8584_macsec_phy_write(phydev, bank, MSCC_MS_SAM_MATCH_SCI_HI(idx),

					 upper_32_bits(flow->rx_sa->sc->sci));

					 upper_32_bits(sci));

	}



	if (flow->match.etype) {

		mask |= MSCC_MS_SAM_MASK_MAC_ETYPE_MASK;



		vsc8584_macsec_phy_write(phydev, bank, MSCC_MS_SAM_MAC_SA_MATCH_HI(idx),

					 MSCC_MS_SAM_MAC_SA_MATCH_HI_ETYPE(htons(flow->etype)));

					 MSCC_MS_SAM_MAC_SA_MATCH_HI_ETYPE((__force u32)htons(flow->etype)));

	}



	match |= MSCC_MS_SAM_MISC_MATCH_PRIORITY(flow->priority);
@@ -545,7 +547,7 @@ static int vsc8584_macsec_transformation(struct phy_device *phydev, 
	int i, ret, index = flow->index;

	u32 rec = 0, control = 0;

	u8 hkey[16];

	sci_t sci;

	u64 sci;



	ret = vsc8584_macsec_derive_key(flow->key, priv->secy->key_len, hkey);

	if (ret)
@@ -603,7 +605,7 @@ static int vsc8584_macsec_transformation(struct phy_device *phydev, 
					 priv->secy->replay_window);



	/* Set the input vectors */

	sci = bank == MACSEC_INGR ? flow->rx_sa->sc->sci : priv->secy->sci;

	sci = (__force u64)(bank == MACSEC_INGR ? flow->rx_sa->sc->sci : priv->secy->sci);

	vsc8584_macsec_phy_write(phydev, bank, MSCC_MS_XFORM_REC(index, rec++),

				 lower_32_bits(sci));

	vsc8584_macsec_phy_write(phydev, bank, MSCC_MS_XFORM_REC(index, rec++),