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

Merge tag 'powerpc-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Madhavan Srinivasan:

 - Fix to handle PE state in pseries_eeh_get_state()

 - Handle unset of tce window if it was never set

Thanks to Narayana Murty N, Ritesh Harjani (IBM), Shivaprasad G Bhat,
and Vaishnavi Bhat.

* tag 'powerpc-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/pseries/iommu: Don't unset window if it was never set
  powerpc/pseries/eeh: Fix get PE state translation
parents fed3819b 17391cb2

arch/powerpc/platforms/pseries/eeh_pseries.c

+4 −2
Original line number Diff line number Diff line
@@ -581,7 +581,9 @@ static int pseries_eeh_get_state(struct eeh_pe *pe, int *delay) 
	switch(rets[0]) {

	case 0:

		result = EEH_STATE_MMIO_ACTIVE	|

			 EEH_STATE_DMA_ACTIVE;

			 EEH_STATE_DMA_ACTIVE	|

			 EEH_STATE_MMIO_ENABLED	|

			 EEH_STATE_DMA_ENABLED;

		break;

	case 1:

		result = EEH_STATE_RESET_ACTIVE |

arch/powerpc/platforms/pseries/iommu.c

+3 −0
Original line number Diff line number Diff line
@@ -2208,6 +2208,9 @@ static long spapr_tce_unset_window(struct iommu_table_group *table_group, int nu 
	const char *win_name;

	int ret = -ENODEV;



	if (!tbl) /* The table was never created OR window was never opened */

		return 0;



	mutex_lock(&dma_win_init_mutex);



	if ((num == 0) && is_default_window_table(table_group, tbl))