Commit d64c6f96 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Jakub Kicinski:
 "Current release - always broken:

   - net/smc: fix access to parent of an ib device

   - devlink: use _BITUL() macro instead of BIT() in the UAPI header

   - handful of mptcp fixes

  Previous release - regressions:

   - intel: AF_XDP: clear the status bits for the next_to_use descriptor

   - dpaa2-eth: fix the size of the mapped SGT buffer

  Previous release - always broken:

   - mptcp: fix security context on server socket

   - ethtool: fix string set id check

   - ethtool: fix error paths in ethnl_set_channels()

   - lan743x: fix rx_napi_poll/interrupt ping-pong

   - qca: ar9331: fix sleeping function called from invalid context bug"

* tag 'net-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (32 commits)
  net/sched: sch_taprio: reset child qdiscs before freeing them
  nfp: move indirect block cleanup to flower app stop callback
  octeontx2-af: Fix undetected unmap PF error check
  net: nixge: fix spelling mistake in Kconfig: "Instuments" -> "Instruments"
  qlcnic: Fix error code in probe
  mptcp: fix pending data accounting
  mptcp: push pending frames when subflow has free space
  mptcp: properly annotate nested lock
  mptcp: fix security context on server socket
  net/mlx5: Fix compilation warning for 32-bit platform
  mptcp: clear use_ack and use_map when dropping other suboptions
  devlink: use _BITUL() macro instead of BIT() in the UAPI header
  net: korina: fix return value
  net/smc: fix access to parent of an ib device
  ethtool: fix error paths in ethnl_set_channels()
  nfc: s3fwrn5: Remove unused NCI prop commands
  nfc: s3fwrn5: Remove the delay for NFC sleep
  phy: fix kdoc warning
  tipc: do sanity check payload of a netlink message
  use __netdev_notify_peers in hyperv
  ...
parents 0c6c8878 44d4775c

Documentation/driver-api/connector.rst

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ handling, etc... The Connector driver allows any kernelspace agents to use 
netlink based networking for inter-process communication in a significantly

easier way::



  int cn_add_callback(struct cb_id *id, char *name, void (*callback) (struct cn_msg *, struct netlink_skb_parms *));

  int cn_add_callback(const struct cb_id *id, char *name, void (*callback) (struct cn_msg *, struct netlink_skb_parms *));

  void cn_netlink_send_mult(struct cn_msg *msg, u16 len, u32 portid, u32 __group, int gfp_mask);

  void cn_netlink_send(struct cn_msg *msg, u32 portid, u32 __group, int gfp_mask);

drivers/connector/cn_queue.c

+4 −4
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


static struct cn_callback_entry *

cn_queue_alloc_callback_entry(struct cn_queue_dev *dev, const char *name,

			      struct cb_id *id,

			      const struct cb_id *id,

			      void (*callback)(struct cn_msg *,

					       struct netlink_skb_parms *))

{
@@ -51,13 +51,13 @@ void cn_queue_release_callback(struct cn_callback_entry *cbq) 
	kfree(cbq);

}



int cn_cb_equal(struct cb_id *i1, struct cb_id *i2)

int cn_cb_equal(const struct cb_id *i1, const struct cb_id *i2)

{

	return ((i1->idx == i2->idx) && (i1->val == i2->val));

}



int cn_queue_add_callback(struct cn_queue_dev *dev, const char *name,

			  struct cb_id *id,

			  const struct cb_id *id,

			  void (*callback)(struct cn_msg *,

					   struct netlink_skb_parms *))

{
@@ -90,7 +90,7 @@ int cn_queue_add_callback(struct cn_queue_dev *dev, const char *name, 
	return 0;

}



void cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id)

void cn_queue_del_callback(struct cn_queue_dev *dev, const struct cb_id *id)

{

	struct cn_callback_entry *cbq, *n;

	int found = 0;

drivers/connector/connector.c

+2 −2
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static void cn_rx_skb(struct sk_buff *skb) 
 *

 * May sleep.

 */

int cn_add_callback(struct cb_id *id, const char *name,

int cn_add_callback(const struct cb_id *id, const char *name,

		    void (*callback)(struct cn_msg *,

				     struct netlink_skb_parms *))

{
@@ -214,7 +214,7 @@ EXPORT_SYMBOL_GPL(cn_add_callback); 
 *

 * May sleep while waiting for reference counter to become zero.

 */

void cn_del_callback(struct cb_id *id)

void cn_del_callback(const struct cb_id *id)

{

	struct cn_dev *dev = &cdev;

drivers/net/dsa/qca/ar9331.c

+24 −9
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ struct ar9331_sw_priv { 
	struct dsa_switch ds;

	struct dsa_switch_ops ops;

	struct irq_domain *irqdomain;

	u32 irq_mask;

	struct mutex lock_irq;

	struct mii_bus *mbus; /* mdio master */

	struct mii_bus *sbus; /* mdio slave */

	struct regmap *regmap;
@@ -520,32 +522,44 @@ static irqreturn_t ar9331_sw_irq(int irq, void *data) 
static void ar9331_sw_mask_irq(struct irq_data *d)

{

	struct ar9331_sw_priv *priv = irq_data_get_irq_chip_data(d);

	struct regmap *regmap = priv->regmap;

	int ret;



	ret = regmap_update_bits(regmap, AR9331_SW_REG_GINT_MASK,

				 AR9331_SW_GINT_PHY_INT, 0);

	if (ret)

		dev_err(priv->dev, "could not mask IRQ\n");

	priv->irq_mask = 0;

}



static void ar9331_sw_unmask_irq(struct irq_data *d)

{

	struct ar9331_sw_priv *priv = irq_data_get_irq_chip_data(d);



	priv->irq_mask = AR9331_SW_GINT_PHY_INT;

}



static void ar9331_sw_irq_bus_lock(struct irq_data *d)

{

	struct ar9331_sw_priv *priv = irq_data_get_irq_chip_data(d);



	mutex_lock(&priv->lock_irq);

}



static void ar9331_sw_irq_bus_sync_unlock(struct irq_data *d)

{

	struct ar9331_sw_priv *priv = irq_data_get_irq_chip_data(d);

	struct regmap *regmap = priv->regmap;

	int ret;



	ret = regmap_update_bits(regmap, AR9331_SW_REG_GINT_MASK,

				 AR9331_SW_GINT_PHY_INT,

				 AR9331_SW_GINT_PHY_INT);

				 AR9331_SW_GINT_PHY_INT, priv->irq_mask);

	if (ret)

		dev_err(priv->dev, "could not unmask IRQ\n");

		dev_err(priv->dev, "failed to change IRQ mask\n");



	mutex_unlock(&priv->lock_irq);

}



static struct irq_chip ar9331_sw_irq_chip = {

	.name = AR9331_SW_NAME,

	.irq_mask = ar9331_sw_mask_irq,

	.irq_unmask = ar9331_sw_unmask_irq,

	.irq_bus_lock = ar9331_sw_irq_bus_lock,

	.irq_bus_sync_unlock = ar9331_sw_irq_bus_sync_unlock,

};



static int ar9331_sw_irq_map(struct irq_domain *domain, unsigned int irq,
@@ -584,6 +598,7 @@ static int ar9331_sw_irq_init(struct ar9331_sw_priv *priv) 
		return irq ? irq : -EINVAL;

	}



	mutex_init(&priv->lock_irq);

	ret = devm_request_threaded_irq(dev, irq, NULL, ar9331_sw_irq,

					IRQF_ONESHOT, AR9331_SW_NAME, priv);

	if (ret) {

drivers/net/ethernet/allwinner/sun4i-emac.c

+5 −2
Original line number Diff line number Diff line
@@ -828,13 +828,13 @@ static int emac_probe(struct platform_device *pdev) 
	db->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(db->clk)) {

		ret = PTR_ERR(db->clk);

		goto out_iounmap;

		goto out_dispose_mapping;

	}



	ret = clk_prepare_enable(db->clk);

	if (ret) {

		dev_err(&pdev->dev, "Error couldn't enable clock (%d)\n", ret);

		goto out_iounmap;

		goto out_dispose_mapping;

	}



	ret = sunxi_sram_claim(&pdev->dev);
@@ -893,6 +893,8 @@ out_release_sram: 
	sunxi_sram_release(&pdev->dev);

out_clk_disable_unprepare:

	clk_disable_unprepare(db->clk);

out_dispose_mapping:

	irq_dispose_mapping(ndev->irq);

out_iounmap:

	iounmap(db->membase);

out:
@@ -911,6 +913,7 @@ static int emac_remove(struct platform_device *pdev) 
	unregister_netdev(ndev);

	sunxi_sram_release(&pdev->dev);

	clk_disable_unprepare(db->clk);

	irq_dispose_mapping(ndev->irq);

	iounmap(db->membase);

	free_netdev(ndev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE