Merge ec7b2e7b365c ("i2c: i801: unregister tco_pdev in i801_probe() error... (74e7ad6a) · Commits · e / devices / android_kernel_fairphone_FP5

arch/powerpc/kernel/hw_breakpoint.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -247,6 +247,11 @@ static bool stepping_handler(struct pt_regs regs, struct perf_event bp,
		return false;
		}

		/*
		* Handle a DABR or DAWR exception.
		*
		* Called in atomic context.
		*/
		int hw_breakpoint_handler(struct die_args *args)
		{
		int rc = NOTIFY_STOP;
		@@ -315,6 +320,8 @@ NOKPROBE_SYMBOL(hw_breakpoint_handler);

		/*
		* Handle single-step exceptions following a DABR hit.
		*
		* Called in atomic context.
		*/
		static int single_step_dabr_instruction(struct die_args *args)
		{
		@@ -355,6 +362,8 @@ NOKPROBE_SYMBOL(single_step_dabr_instruction);

		/*
		* Handle debug exception notifications.
		*
		* Called in atomic context.
		*/
		int hw_breakpoint_exceptions_notify(
		struct notifier_block unused, unsigned long val, void data)

drivers/ata/libata-eh.c

+3 −10

Original line number	Diff line number	Diff line
		@@ -2901,18 +2901,11 @@ int ata_eh_reset(struct ata_link *link, int classify,
		postreset(slave, classes);
		}

		/*
		* Some controllers can't be frozen very well and may set spurious
		* error conditions during reset. Clear accumulated error
		* information and re-thaw the port if frozen. As reset is the
		* final recovery action and we cross check link onlineness against
		* device classification later, no hotplug event is lost by this.
		*/
		/* clear cached SError */
		spin_lock_irqsave(link->ap->lock, flags);
		memset(&link->eh_info, 0, sizeof(link->eh_info));
		link->eh_info.serror = 0;
		if (slave)
		memset(&slave->eh_info, 0, sizeof(link->eh_info));
		ap->pflags &= ~ATA_PFLAG_EH_PENDING;
		slave->eh_info.serror = 0;
		spin_unlock_irqrestore(link->ap->lock, flags);

		if (ap->pflags & ATA_PFLAG_FROZEN)

drivers/ata/libata-scsi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4544,7 +4544,7 @@ void ata_scsi_simulate(struct ata_device dev, struct scsi_cmnd cmd)
		break;

		case MAINTENANCE_IN:
		if (scsicmd[1] == MI_REPORT_SUPPORTED_OPERATION_CODES)
		if ((scsicmd[1] & 0x1f) == MI_REPORT_SUPPORTED_OPERATION_CODES)
		ata_scsi_rbuf_fill(&args, ata_scsiop_maint_in);
		else
		ata_scsi_set_invalid_field(dev, cmd, 1, 0xff);

drivers/i2c/busses/i2c-i801.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1873,6 +1873,7 @@ static int i801_probe(struct pci_dev dev, const struct pci_device_id id)
		"SMBus I801 adapter at %04lx", priv->smba);
		err = i2c_add_adapter(&priv->adapter);
		if (err) {
		platform_device_unregister(priv->tco_pdev);
		i801_acpi_remove(priv);
		return err;
		}

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

+36 −9

Original line number	Diff line number	Diff line
		@@ -1117,15 +1117,15 @@ static int i40e_quiesce_vf_pci(struct i40e_vf *vf)
		}

		/**
		* i40e_getnum_vf_vsi_vlan_filters
		* __i40e_getnum_vf_vsi_vlan_filters
		* @vsi: pointer to the vsi
		*
		* called to get the number of VLANs offloaded on this VF
		**/
		static int i40e_getnum_vf_vsi_vlan_filters(struct i40e_vsi *vsi)
		static int __i40e_getnum_vf_vsi_vlan_filters(struct i40e_vsi *vsi)
		{
		struct i40e_mac_filter *f;
		int num_vlans = 0, bkt;
		u16 num_vlans = 0, bkt;

		hash_for_each(vsi->mac_filter_hash, bkt, f, hlist) {
		if (f->vlan >= 0 && f->vlan <= I40E_MAX_VLANID)
		@@ -1135,6 +1135,23 @@ static int i40e_getnum_vf_vsi_vlan_filters(struct i40e_vsi *vsi)
		return num_vlans;
		}

		/**
		* i40e_getnum_vf_vsi_vlan_filters
		* @vsi: pointer to the vsi
		*
		* wrapper for __i40e_getnum_vf_vsi_vlan_filters() with spinlock held
		**/
		static int i40e_getnum_vf_vsi_vlan_filters(struct i40e_vsi *vsi)
		{
		int num_vlans;

		spin_lock_bh(&vsi->mac_filter_hash_lock);
		num_vlans = __i40e_getnum_vf_vsi_vlan_filters(vsi);
		spin_unlock_bh(&vsi->mac_filter_hash_lock);

		return num_vlans;
		}

		/**
		* i40e_get_vlan_list_sync
		* @vsi: pointer to the VSI
		@@ -1144,7 +1161,7 @@ static int i40e_getnum_vf_vsi_vlan_filters(struct i40e_vsi *vsi)
		*
		* Called to get number of VLANs and VLAN list present in mac_filter_hash.
		**/
		static void i40e_get_vlan_list_sync(struct i40e_vsi vsi, int num_vlans,
		static void i40e_get_vlan_list_sync(struct i40e_vsi vsi, u16 num_vlans,
		s16 **vlan_list)
		{
		struct i40e_mac_filter *f;
		@@ -1152,7 +1169,7 @@ static void i40e_get_vlan_list_sync(struct i40e_vsi vsi, int num_vlans,
		int bkt;

		spin_lock_bh(&vsi->mac_filter_hash_lock);
		*num_vlans = i40e_getnum_vf_vsi_vlan_filters(vsi);
		*num_vlans = __i40e_getnum_vf_vsi_vlan_filters(vsi);
		vlan_list = kcalloc(num_vlans, sizeof(**vlan_list), GFP_ATOMIC);
		if (!(*vlan_list))
		goto err;
		@@ -1179,11 +1196,11 @@ static void i40e_get_vlan_list_sync(struct i40e_vsi vsi, int num_vlans,
		**/
		static i40e_status
		i40e_set_vsi_promisc(struct i40e_vf *vf, u16 seid, bool multi_enable,
		bool unicast_enable, s16 *vl, int num_vlans)
		bool unicast_enable, s16 *vl, u16 num_vlans)
		{
		i40e_status aq_ret, aq_tmp = 0;
		struct i40e_pf *pf = vf->pf;
		struct i40e_hw *hw = &pf->hw;
		i40e_status aq_ret;
		int i;

		/* No VLAN to set promisc on, set on VSI */
		@@ -1232,6 +1249,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, u16 seid, bool multi_enable,
		vf->vf_id,
		i40e_stat_str(&pf->hw, aq_ret),
		i40e_aq_str(&pf->hw, aq_err));

		if (!aq_tmp)
		aq_tmp = aq_ret;
		}

		aq_ret = i40e_aq_set_vsi_uc_promisc_on_vlan(hw, seid,
		@@ -1245,8 +1265,15 @@ i40e_set_vsi_promisc(struct i40e_vf *vf, u16 seid, bool multi_enable,
		vf->vf_id,
		i40e_stat_str(&pf->hw, aq_ret),
		i40e_aq_str(&pf->hw, aq_err));

		if (!aq_tmp)
		aq_tmp = aq_ret;
		}
		}

		if (aq_tmp)
		aq_ret = aq_tmp;

		return aq_ret;
		}

		@@ -1268,7 +1295,7 @@ static i40e_status i40e_config_vf_promiscuous_mode(struct i40e_vf *vf,
		i40e_status aq_ret = I40E_SUCCESS;
		struct i40e_pf *pf = vf->pf;
		struct i40e_vsi *vsi;
		int num_vlans;
		u16 num_vlans;
		s16 *vl;

		vsi = i40e_find_vsi_from_id(pf, vsi_id);