Commit 9ac7f797 authored by Jakub Kicinski's avatar Jakub Kicinski

Merge branch 'net-microchip-correct-spelling-in-comments'

Simon Horman says:

====================
net: microchip: Correct spelling in comments

Correct spelling in comments in Microchip drivers.
Flagged by codespell.

v1: https://lore.kernel.org/r/20240419-lan743x-confirm-v1-0-2a087617a3e5@kernel.org
====================

Link: https://lore.kernel.org/r/20240424-lan743x-confirm-v2-0-f0480542e39f@kernel.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 092d2141 d896a374
...@@ -75,7 +75,7 @@ static int regmap_encx24j600_sfr_read(void *context, u8 reg, u8 *val, ...@@ -75,7 +75,7 @@ static int regmap_encx24j600_sfr_read(void *context, u8 reg, u8 *val,
if (unlikely(ret)) if (unlikely(ret))
return ret; return ret;
} else { } else {
/* Translate registers that are more effecient using /* Translate registers that are more efficient using
* 3-byte SPI commands * 3-byte SPI commands
*/ */
switch (reg) { switch (reg) {
...@@ -129,7 +129,7 @@ static int regmap_encx24j600_sfr_update(struct encx24j600_context *ctx, ...@@ -129,7 +129,7 @@ static int regmap_encx24j600_sfr_update(struct encx24j600_context *ctx,
if (unlikely(ret)) if (unlikely(ret))
return ret; return ret;
} else { } else {
/* Translate registers that are more effecient using /* Translate registers that are more efficient using
* 3-byte SPI commands * 3-byte SPI commands
*/ */
switch (reg) { switch (reg) {
......
...@@ -569,7 +569,7 @@ static void encx24j600_dump_config(struct encx24j600_priv *priv, ...@@ -569,7 +569,7 @@ static void encx24j600_dump_config(struct encx24j600_priv *priv,
pr_info(DRV_NAME " MABBIPG: %04X\n", encx24j600_read_reg(priv, pr_info(DRV_NAME " MABBIPG: %04X\n", encx24j600_read_reg(priv,
MABBIPG)); MABBIPG));
/* PHY configuation */ /* PHY configuration */
pr_info(DRV_NAME " PHCON1: %04X\n", encx24j600_read_phy(priv, PHCON1)); pr_info(DRV_NAME " PHCON1: %04X\n", encx24j600_read_phy(priv, PHCON1));
pr_info(DRV_NAME " PHCON2: %04X\n", encx24j600_read_phy(priv, PHCON2)); pr_info(DRV_NAME " PHCON2: %04X\n", encx24j600_read_phy(priv, PHCON2));
pr_info(DRV_NAME " PHANA: %04X\n", encx24j600_read_phy(priv, PHANA)); pr_info(DRV_NAME " PHANA: %04X\n", encx24j600_read_phy(priv, PHANA));
...@@ -837,7 +837,9 @@ static void encx24j600_hw_tx(struct encx24j600_priv *priv) ...@@ -837,7 +837,9 @@ static void encx24j600_hw_tx(struct encx24j600_priv *priv)
dump_packet("TX", priv->tx_skb->len, priv->tx_skb->data); dump_packet("TX", priv->tx_skb->len, priv->tx_skb->data);
if (encx24j600_read_reg(priv, EIR) & TXABTIF) if (encx24j600_read_reg(priv, EIR) & TXABTIF)
/* Last transmition aborted due to error. Reset TX interface */ /* Last transmission aborted due to error.
* Reset TX interface
*/
encx24j600_reset_hw_tx(priv); encx24j600_reset_hw_tx(priv);
/* Clear the TXIF flag if were previously set */ /* Clear the TXIF flag if were previously set */
......
...@@ -243,7 +243,7 @@ int devm_regmap_init_encx24j600(struct device *dev, ...@@ -243,7 +243,7 @@ int devm_regmap_init_encx24j600(struct device *dev,
/* MAIPG */ /* MAIPG */
/* value of the high byte is given by the reserved bits, /* value of the high byte is given by the reserved bits,
* value of the low byte is recomended setting of the * value of the low byte is recommended setting of the
* IPG parameter. * IPG parameter.
*/ */
#define MAIPGH_VAL 0x0C #define MAIPGH_VAL 0x0C
......
...@@ -803,7 +803,7 @@ static int lan743x_mdiobus_read_c22(struct mii_bus *bus, int phy_id, int index) ...@@ -803,7 +803,7 @@ static int lan743x_mdiobus_read_c22(struct mii_bus *bus, int phy_id, int index)
u32 val, mii_access; u32 val, mii_access;
int ret; int ret;
/* comfirm MII not busy */ /* confirm MII not busy */
ret = lan743x_mac_mii_wait_till_not_busy(adapter); ret = lan743x_mac_mii_wait_till_not_busy(adapter);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -868,7 +868,7 @@ static int lan743x_mdiobus_read_c45(struct mii_bus *bus, int phy_id, ...@@ -868,7 +868,7 @@ static int lan743x_mdiobus_read_c45(struct mii_bus *bus, int phy_id,
u32 mmd_access; u32 mmd_access;
int ret; int ret;
/* comfirm MII not busy */ /* confirm MII not busy */
ret = lan743x_mac_mii_wait_till_not_busy(adapter); ret = lan743x_mac_mii_wait_till_not_busy(adapter);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
...@@ -555,7 +555,7 @@ static int lan743x_ptp_perout(struct lan743x_adapter *adapter, int on, ...@@ -555,7 +555,7 @@ static int lan743x_ptp_perout(struct lan743x_adapter *adapter, int on,
if (half == wf_high) { if (half == wf_high) {
/* It's 50% match. Use the toggle option */ /* It's 50% match. Use the toggle option */
pulse_width = PTP_GENERAL_CONFIG_CLOCK_EVENT_TOGGLE_; pulse_width = PTP_GENERAL_CONFIG_CLOCK_EVENT_TOGGLE_;
/* In this case, devide period value by 2 */ /* In this case, divide period value by 2 */
ts_period = ns_to_timespec64(div_s64(period64, 2)); ts_period = ns_to_timespec64(div_s64(period64, 2));
period_sec = ts_period.tv_sec; period_sec = ts_period.tv_sec;
period_nsec = ts_period.tv_nsec; period_nsec = ts_period.tv_nsec;
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
/* Classified internal priority for queuing */ /* Classified internal priority for queuing */
#define IFH_POS_QOS_CLASS 100 #define IFH_POS_QOS_CLASS 100
/* Bit mask with eight cpu copy classses */ /* Bit mask with eight cpu copy classes */
#define IFH_POS_CPUQ 92 #define IFH_POS_CPUQ 92
/* Relearn + learn flags (*) */ /* Relearn + learn flags (*) */
......
...@@ -276,7 +276,7 @@ static int lan966x_port_ifh_xmit(struct sk_buff *skb, ...@@ -276,7 +276,7 @@ static int lan966x_port_ifh_xmit(struct sk_buff *skb,
++i; ++i;
} }
/* Inidcate EOF and valid bytes in the last word */ /* Indicate EOF and valid bytes in the last word */
lan_wr(QS_INJ_CTRL_GAP_SIZE_SET(1) | lan_wr(QS_INJ_CTRL_GAP_SIZE_SET(1) |
QS_INJ_CTRL_VLD_BYTES_SET(skb->len < LAN966X_BUFFER_MIN_SZ ? QS_INJ_CTRL_VLD_BYTES_SET(skb->len < LAN966X_BUFFER_MIN_SZ ?
0 : last) | 0 : last) |
...@@ -520,7 +520,7 @@ bool lan966x_hw_offload(struct lan966x *lan966x, u32 port, struct sk_buff *skb) ...@@ -520,7 +520,7 @@ bool lan966x_hw_offload(struct lan966x *lan966x, u32 port, struct sk_buff *skb)
u32 val; u32 val;
/* The IGMP and MLD frames are not forward by the HW if /* The IGMP and MLD frames are not forward by the HW if
* multicast snooping is enabled, therefor don't mark as * multicast snooping is enabled, therefore don't mark as
* offload to allow the SW to forward the frames accordingly. * offload to allow the SW to forward the frames accordingly.
*/ */
val = lan_rd(lan966x, ANA_CPU_FWD_CFG(port)); val = lan_rd(lan966x, ANA_CPU_FWD_CFG(port));
......
...@@ -326,7 +326,7 @@ struct lan966x { ...@@ -326,7 +326,7 @@ struct lan966x {
u8 base_mac[ETH_ALEN]; u8 base_mac[ETH_ALEN];
spinlock_t tx_lock; /* lock for frame transmition */ spinlock_t tx_lock; /* lock for frame transmission */
struct net_device *bridge; struct net_device *bridge;
u16 bridge_mask; u16 bridge_mask;
......
...@@ -88,7 +88,7 @@ static void lan966x_port_link_down(struct lan966x_port *port) ...@@ -88,7 +88,7 @@ static void lan966x_port_link_down(struct lan966x_port *port)
SYS_FRONT_PORT_MODE_HDX_MODE, SYS_FRONT_PORT_MODE_HDX_MODE,
lan966x, SYS_FRONT_PORT_MODE(port->chip_port)); lan966x, SYS_FRONT_PORT_MODE(port->chip_port));
/* 8: Flush the queues accociated with the port */ /* 8: Flush the queues associated with the port */
lan_rmw(QSYS_SW_PORT_MODE_AGING_MODE_SET(3), lan_rmw(QSYS_SW_PORT_MODE_AGING_MODE_SET(3),
QSYS_SW_PORT_MODE_AGING_MODE, QSYS_SW_PORT_MODE_AGING_MODE,
lan966x, QSYS_SW_PORT_MODE(port->chip_port)); lan966x, QSYS_SW_PORT_MODE(port->chip_port));
......
...@@ -157,7 +157,7 @@ void lan966x_vlan_port_apply(struct lan966x_port *port) ...@@ -157,7 +157,7 @@ void lan966x_vlan_port_apply(struct lan966x_port *port)
pvid = lan966x_vlan_port_get_pvid(port); pvid = lan966x_vlan_port_get_pvid(port);
/* Ingress clasification (ANA_PORT_VLAN_CFG) */ /* Ingress classification (ANA_PORT_VLAN_CFG) */
/* Default vlan to classify for untagged frames (may be zero) */ /* Default vlan to classify for untagged frames (may be zero) */
val = ANA_VLAN_CFG_VLAN_VID_SET(pvid); val = ANA_VLAN_CFG_VLAN_VID_SET(pvid);
if (port->vlan_aware) if (port->vlan_aware)
......
...@@ -143,7 +143,7 @@ static void sparx5_fdma_rx_activate(struct sparx5 *sparx5, struct sparx5_rx *rx) ...@@ -143,7 +143,7 @@ static void sparx5_fdma_rx_activate(struct sparx5 *sparx5, struct sparx5_rx *rx)
static void sparx5_fdma_rx_deactivate(struct sparx5 *sparx5, struct sparx5_rx *rx) static void sparx5_fdma_rx_deactivate(struct sparx5 *sparx5, struct sparx5_rx *rx)
{ {
/* Dectivate the RX channel */ /* Deactivate the RX channel */
spx5_rmw(0, BIT(rx->channel_id) & FDMA_CH_ACTIVATE_CH_ACTIVATE, spx5_rmw(0, BIT(rx->channel_id) & FDMA_CH_ACTIVATE_CH_ACTIVATE,
sparx5, FDMA_CH_ACTIVATE); sparx5, FDMA_CH_ACTIVATE);
......
...@@ -67,7 +67,7 @@ static void sparx5_xtr_grp(struct sparx5 *sparx5, u8 grp, bool byte_swap) ...@@ -67,7 +67,7 @@ static void sparx5_xtr_grp(struct sparx5 *sparx5, u8 grp, bool byte_swap)
for (i = 0; i < IFH_LEN; i++) for (i = 0; i < IFH_LEN; i++)
ifh[i] = spx5_rd(sparx5, QS_XTR_RD(grp)); ifh[i] = spx5_rd(sparx5, QS_XTR_RD(grp));
/* Decode IFH (whats needed) */ /* Decode IFH (what's needed) */
sparx5_ifh_parse(ifh, &fi); sparx5_ifh_parse(ifh, &fi);
/* Map to port netdev */ /* Map to port netdev */
......
...@@ -370,7 +370,7 @@ static int sparx5_port_disable(struct sparx5 *sparx5, struct sparx5_port *port, ...@@ -370,7 +370,7 @@ static int sparx5_port_disable(struct sparx5 *sparx5, struct sparx5_port *port,
/* 6: Wait while the last frame is exiting the queues */ /* 6: Wait while the last frame is exiting the queues */
usleep_range(8 * spd_prm, 10 * spd_prm); usleep_range(8 * spd_prm, 10 * spd_prm);
/* 7: Flush the queues accociated with the port->portno */ /* 7: Flush the queues associated with the port->portno */
spx5_rmw(HSCH_FLUSH_CTRL_FLUSH_PORT_SET(port->portno) | spx5_rmw(HSCH_FLUSH_CTRL_FLUSH_PORT_SET(port->portno) |
HSCH_FLUSH_CTRL_FLUSH_DST_SET(1) | HSCH_FLUSH_CTRL_FLUSH_DST_SET(1) |
HSCH_FLUSH_CTRL_FLUSH_SRC_SET(1) | HSCH_FLUSH_CTRL_FLUSH_SRC_SET(1) |
......
...@@ -190,7 +190,7 @@ static int sparx5_port_bridge_join(struct sparx5_port *port, ...@@ -190,7 +190,7 @@ static int sparx5_port_bridge_join(struct sparx5_port *port,
/* Remove standalone port entry */ /* Remove standalone port entry */
sparx5_mact_forget(sparx5, ndev->dev_addr, 0); sparx5_mact_forget(sparx5, ndev->dev_addr, 0);
/* Port enters in bridge mode therefor don't need to copy to CPU /* Port enters in bridge mode therefore don't need to copy to CPU
* frames for multicast in case the bridge is not requesting them * frames for multicast in case the bridge is not requesting them
*/ */
__dev_mc_unsync(ndev, sparx5_mc_unsync); __dev_mc_unsync(ndev, sparx5_mc_unsync);
......
...@@ -290,7 +290,7 @@ enum vcap_keyfield_set { ...@@ -290,7 +290,7 @@ enum vcap_keyfield_set {
* Sparx5: TCP flag RST , LAN966x: TCP: TCP flag RST. PTP over UDP: messageType * Sparx5: TCP flag RST , LAN966x: TCP: TCP flag RST. PTP over UDP: messageType
* bit 3 * bit 3
* VCAP_KF_L4_SEQUENCE_EQ0_IS: W1, sparx5: is2/es2, lan966x: is2 * VCAP_KF_L4_SEQUENCE_EQ0_IS: W1, sparx5: is2/es2, lan966x: is2
* Set if TCP sequence number is 0, LAN966x: Overlayed with PTP over UDP: * Set if TCP sequence number is 0, LAN966x: Overlaid with PTP over UDP:
* messageType bit 0 * messageType bit 0
* VCAP_KF_L4_SPORT: W16, sparx5: is0/is2/es2, lan966x: is1/is2 * VCAP_KF_L4_SPORT: W16, sparx5: is0/is2/es2, lan966x: is1/is2
* TCP/UDP source port * TCP/UDP source port
......
...@@ -327,7 +327,7 @@ static int vcap_find_keystream_typegroup_sw(struct vcap_control *vctrl, ...@@ -327,7 +327,7 @@ static int vcap_find_keystream_typegroup_sw(struct vcap_control *vctrl,
} }
/* Verify that the typegroup information, subword count, keyset and type id /* Verify that the typegroup information, subword count, keyset and type id
* are in sync and correct, return the list of matchin keysets * are in sync and correct, return the list of matching keysets
*/ */
int int
vcap_find_keystream_keysets(struct vcap_control *vctrl, vcap_find_keystream_keysets(struct vcap_control *vctrl,
...@@ -2943,7 +2943,7 @@ void vcap_netbytes_copy(u8 *dst, u8 *src, int count) ...@@ -2943,7 +2943,7 @@ void vcap_netbytes_copy(u8 *dst, u8 *src, int count)
} }
EXPORT_SYMBOL_GPL(vcap_netbytes_copy); EXPORT_SYMBOL_GPL(vcap_netbytes_copy);
/* Convert validation error code into tc extact error message */ /* Convert validation error code into tc extack error message */
void vcap_set_tc_exterr(struct flow_cls_offload *fco, struct vcap_rule *vrule) void vcap_set_tc_exterr(struct flow_cls_offload *fco, struct vcap_rule *vrule)
{ {
switch (vrule->exterr) { switch (vrule->exterr) {
......
...@@ -238,7 +238,7 @@ const struct vcap_set *vcap_keyfieldset(struct vcap_control *vctrl, ...@@ -238,7 +238,7 @@ const struct vcap_set *vcap_keyfieldset(struct vcap_control *vctrl,
/* Copy to host byte order */ /* Copy to host byte order */
void vcap_netbytes_copy(u8 *dst, u8 *src, int count); void vcap_netbytes_copy(u8 *dst, u8 *src, int count);
/* Convert validation error code into tc extact error message */ /* Convert validation error code into tc extack error message */
void vcap_set_tc_exterr(struct flow_cls_offload *fco, struct vcap_rule *vrule); void vcap_set_tc_exterr(struct flow_cls_offload *fco, struct vcap_rule *vrule);
/* Cleanup a VCAP instance */ /* Cleanup a VCAP instance */
......
...@@ -109,7 +109,7 @@ int vcap_addr_keysets(struct vcap_control *vctrl, struct net_device *ndev, ...@@ -109,7 +109,7 @@ int vcap_addr_keysets(struct vcap_control *vctrl, struct net_device *ndev,
struct vcap_keyset_list *kslist); struct vcap_keyset_list *kslist);
/* Verify that the typegroup information, subword count, keyset and type id /* Verify that the typegroup information, subword count, keyset and type id
* are in sync and correct, return the list of matchin keysets * are in sync and correct, return the list of matching keysets
*/ */
int vcap_find_keystream_keysets(struct vcap_control *vctrl, enum vcap_type vt, int vcap_find_keystream_keysets(struct vcap_control *vctrl, enum vcap_type vt,
u32 *keystream, u32 *mskstream, bool mask, u32 *keystream, u32 *mskstream, bool mask,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment