From nobody Mon Jan 24 20:21:32 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4D6791978600; Mon, 24 Jan 2022 20:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JjLwr1m7Dz3tX2; Mon, 24 Jan 2022 20:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643055692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7auT4rkEC03n+ntpYfJG40/3dZbxV2nDAAoEDTXx6gM=; b=NeKCbCWwNpFiSnKPW4sRhmN8qeAolpgQ4PKJ3K3U3czxavLa/LlJkGj1K3GfpI4g7QYi/L CrbWBwQyUGDN70+n4BYLDYAmgS4LQlWhqc2uvoy/4gc06L/A/QJb7d3cUbphjoWKTzf9Xi okZxjeycFzGAzecN1im5Bw30na+qvsaMwMa73GFm8KYNCjRZI+eyiPVVCebLVBt4L3r7oG QObyM98xnIOnqtF8O5eT+ZaqtVho4EOErW22w5Pt83gidQwul2NK/4xN1FRsZeJP6ovbtP Fz83prd6ElgavqOXBYeJDPe4L7sBO+rX3VPbZgAF8JeoB9ss2buX93LH3cc4fg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1D0E41C5A8; Mon, 24 Jan 2022 20:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20OKLWX8026898; Mon, 24 Jan 2022 20:21:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20OKLWOD026897; Mon, 24 Jan 2022 20:21:32 GMT (envelope-from git) Date: Mon, 24 Jan 2022 20:21:32 GMT Message-Id: <202201242021.20OKLWOD026897@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 802f8d4afeaf - main - mpr/mps: Remove write-only flag and callout List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 802f8d4afeafa8667af378c652b7a5cf12958b4e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643055692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7auT4rkEC03n+ntpYfJG40/3dZbxV2nDAAoEDTXx6gM=; b=VnHSR2CXMyV8ZAs/JPU5TcKcB94ZkkNFs+6AiYF1W4TdaWVOpEyz/3jnp9f9KkN8V8T8gH um+1PrL0qZD3SkseHKYMb9hKlSA+iRhrpvqa9FF1qifUZCH0sJm236Dv53eqXNuj7tMRSC +fN0xGL8SBbneKvp7DRN/F2mQJU3wP+xzu63uAZNQN2yVYPWi4a2V9UhDp+ZycaE1+0bju mJhF5ezLnK0eKIvzpwHwSCSASLtrS4/bgxCALTYdkOI4EPpuKgzCp5OUK5r2yLD5eLLggZ XnwdHbYp/PvZe2wFX9Ku/lWDVYf3d6x8Jsp25/4vftwglRdTnFSz+i/4d1djBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643055692; a=rsa-sha256; cv=none; b=Vjb7ZMQneoAqhsb+2pdCepZWZeuWsF3uFtQc1xaN6cfA/bdwrcLsgTRmZRFnv6XDmP8GEg 0Wi11UnHZcbgoynO2saa2Lo+fqOAg4v5XsYjvaATMAkAUPJOMTFasi+thccb36L0kz7tPe w3sXWYeRou1HeG4GsL2N2BtPDN2NxnnBBojNkG811qTym8VSxO1mS2gtF2Ip9Br4lR+hck xmVZrVKYCzdaBUHGwh+LT8Tx4C9VutFpY2z6DnL6OetiJfJOU9qVwQSBAMj5E9CjtcAVAS Riq65XUB/v11zpCKxoOEKBlVeIazLZqVnCKBwvszRoZzH3gNknpB9zwKbc0IVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=802f8d4afeafa8667af378c652b7a5cf12958b4e commit 802f8d4afeafa8667af378c652b7a5cf12958b4e Author: Warner Losh AuthorDate: 2022-01-24 20:21:09 +0000 Commit: Warner Losh CommitDate: 2022-01-24 20:21:09 +0000 mpr/mps: Remove write-only flag and callout The discovery callout is initialized and cancelled only, making it write-only. Remove a state flag associated with it being pending as well as two defines that aren't used that are associated with it. Remove MP?SAS_SHUTDOWN flag, which is unused. Sponsored by: Netflix Reviewed by: ken, scottl, mav Differential Revision: https://reviews.freebsd.org/D33925 --- sys/dev/mpr/mpr_sas.c | 5 ----- sys/dev/mpr/mpr_sas.h | 3 --- sys/dev/mps/mps_sas.c | 8 -------- sys/dev/mps/mps_sas.h | 3 --- 4 files changed, 19 deletions(-) diff --git a/sys/dev/mpr/mpr_sas.c b/sys/dev/mpr/mpr_sas.c index db5df14562e7..4a8dccb18538 100644 --- a/sys/dev/mpr/mpr_sas.c +++ b/sys/dev/mpr/mpr_sas.c @@ -820,8 +820,6 @@ mpr_attach_sas(struct mpr_softc *sc) sc->sassc->startup_refcount = 0; mprsas_startup_increment(sassc); - callout_init(&sassc->discovery_callout, 1 /*mpsafe*/); - mpr_unlock(sc); /* @@ -937,9 +935,6 @@ mprsas_discovery_end(struct mprsas_softc *sassc) MPR_FUNCTRACE(sc); - if (sassc->flags & MPRSAS_DISCOVERY_TIMEOUT_PENDING) - callout_stop(&sassc->discovery_callout); - /* * After discovery has completed, check the mapping table for any * missing devices and update their missing counts. Only do this once diff --git a/sys/dev/mpr/mpr_sas.h b/sys/dev/mpr/mpr_sas.h index 4ec6be15613c..5c7344eef6fa 100644 --- a/sys/dev/mpr/mpr_sas.h +++ b/sys/dev/mpr/mpr_sas.h @@ -91,9 +91,7 @@ struct mprsas_softc { u_int flags; #define MPRSAS_IN_DISCOVERY (1 << 0) #define MPRSAS_IN_STARTUP (1 << 1) -#define MPRSAS_DISCOVERY_TIMEOUT_PENDING (1 << 2) #define MPRSAS_QUEUE_FROZEN (1 << 3) -#define MPRSAS_SHUTDOWN (1 << 4) #define MPRSAS_TOREMOVE (1 << 5) u_int maxtargets; struct mprsas_target *targets; @@ -101,7 +99,6 @@ struct mprsas_softc { struct cam_sim *sim; struct cam_path *path; struct intr_config_hook sas_ich; - struct callout discovery_callout; struct mpr_event_handle *mprsas_eh; u_int startup_refcount; diff --git a/sys/dev/mps/mps_sas.c b/sys/dev/mps/mps_sas.c index 681565aca2d1..e55c4978208a 100644 --- a/sys/dev/mps/mps_sas.c +++ b/sys/dev/mps/mps_sas.c @@ -86,9 +86,6 @@ __FBSDID("$FreeBSD$"); #include #include -#define MPSSAS_DISCOVERY_TIMEOUT 20 -#define MPSSAS_MAX_DISCOVERY_TIMEOUTS 10 /* 200 seconds */ - /* * static array to check SCSI OpCode for EEDP protection bits */ @@ -773,8 +770,6 @@ mps_attach_sas(struct mps_softc *sc) sc->sassc->startup_refcount = 0; mpssas_startup_increment(sassc); - callout_init(&sassc->discovery_callout, 1 /*mpsafe*/); - mps_unlock(sc); /* @@ -889,9 +884,6 @@ mpssas_discovery_end(struct mpssas_softc *sassc) MPS_FUNCTRACE(sc); - if (sassc->flags & MPSSAS_DISCOVERY_TIMEOUT_PENDING) - callout_stop(&sassc->discovery_callout); - /* * After discovery has completed, check the mapping table for any * missing devices and update their missing counts. Only do this once diff --git a/sys/dev/mps/mps_sas.h b/sys/dev/mps/mps_sas.h index 4d782ad8e7a3..3750500f4091 100644 --- a/sys/dev/mps/mps_sas.h +++ b/sys/dev/mps/mps_sas.h @@ -86,16 +86,13 @@ struct mpssas_softc { u_int flags; #define MPSSAS_IN_DISCOVERY (1 << 0) #define MPSSAS_IN_STARTUP (1 << 1) -#define MPSSAS_DISCOVERY_TIMEOUT_PENDING (1 << 2) #define MPSSAS_QUEUE_FROZEN (1 << 3) -#define MPSSAS_SHUTDOWN (1 << 4) u_int maxtargets; struct mpssas_target *targets; struct cam_devq *devq; struct cam_sim *sim; struct cam_path *path; struct intr_config_hook sas_ich; - struct callout discovery_callout; struct mps_event_handle *mpssas_eh; u_int startup_refcount;