Linux v6.10 directionless reconfigure behaviour

Author: warthog618

uapi/uapi_test.go

@@ -1004,7 +1004,7 @@ func TestSetLineHandleConfig(t *testing.T) {
 			[]uint8{1, 0, 1},
 			uapi.HandleRequestActiveLow,
 			[]uint8{1, 0, 1},
-			nil,
+			unix.EINVAL,
 		},
 		{
 			"as-is atv-lo to as-is atv-hi",
@@ -1013,7 +1013,7 @@ func TestSetLineHandleConfig(t *testing.T) {
 			[]uint8{1, 0, 1},
 			0,
 			[]uint8{1, 0, 1},
-			nil,
+			unix.EINVAL,
 		},
 		{
 			"input atv-lo to input atv-hi",
@@ -1063,7 +1063,7 @@ func TestSetLineHandleConfig(t *testing.T) {
 			[]uint8{1, 0, 1},
 			0,
 			[]uint8{1, 0, 1},
-			nil,
+			unix.EINVAL,
 		},
 		{
 			"input atv-hi to as-is atv-lo",
@@ -1072,7 +1072,7 @@ func TestSetLineHandleConfig(t *testing.T) {
 			[]uint8{1, 0, 1},
 			uapi.HandleRequestActiveLow,
 			[]uint8{1, 0, 1},
-			nil,
+			unix.EINVAL,
 		},
 		{
 			"input pull-up to input pull-down",
@@ -1103,17 +1103,17 @@ func TestSetLineHandleConfig(t *testing.T) {
 				uapi.HandleRequestActiveLow,
 			[]uint8{1, 0, 1},
 			0,
-			[]uint8{0, 1, 0}, // must be opposite of initial as mock is not updated
-			nil,
+			[]uint8{1, 0, 1},
+			unix.EINVAL,
 		},
 		{
 			"output atv-hi to as-is atv-lo",
 			[]uint32{1, 2, 3},
 			uapi.HandleRequestOutput,
 			[]uint8{1, 0, 1},
 			uapi.HandleRequestActiveLow,
-			[]uint8{0, 1, 0}, // must be opposite of initial as mock is not updated
-			nil,
+			[]uint8{1, 0, 1},
+			unix.EINVAL,
 		},
 		// expected errors
 		{
@@ -1445,7 +1445,7 @@ func TestWatchLineInfo(t *testing.T) {
 	assert.Nil(t, chg, "spurious change")
 
 	// reconfig line
-	hc := uapi.HandleConfig{Flags: uapi.HandleRequestActiveLow}
+	hc := uapi.HandleConfig{Flags: uapi.HandleRequestInput | uapi.HandleRequestActiveLow}
 	copy(hr.Consumer[:], "testwatch")
 	err = uapi.SetLineConfig(uintptr(hr.Fd), &hc)
 	assert.Nil(t, err)

uapi/uapi_v2_test.go

@@ -1880,7 +1880,7 @@ func TestSetLineConfigV2(t *testing.T) {
 					Flags:  uapi.LineFlagV2Used | p.config.Flags,
 				}
 				if p.config.Flags&uapi.LineFlagV2DirectionMask == 0 {
-					xli.Flags |= p.lr.Config.Flags & uapi.LineFlagV2DirectionMask
+					xli.Flags = uapi.LineFlagV2Used | p.lr.Config.Flags
 				}
 				if xli.Flags&uapi.LineFlagV2DirectionMask == 0 {
 					li.Flags &^= uapi.LineFlagV2DirectionMask
@@ -2094,7 +2094,7 @@ func TestWatchLineInfoV2(t *testing.T) {
 	assert.Nil(t, chg, "spurious change")
 
 	// reconfig line
-	lc := uapi.LineConfig{Flags: uapi.LineFlagV2ActiveLow}
+	lc := uapi.LineConfig{Flags: uapi.LineFlagV2Input | uapi.LineFlagV2ActiveLow}
 	err = uapi.SetLineConfigV2(uintptr(lr.Fd), &lc)
 	assert.Nil(t, err)
 	chg, err = readLineInfoChangedV2Timeout(f.Fd(), eventWaitTimeout)