Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'pds_core-cleanups'

Shannon Nelson says:

====================
pds_core: small code updates

These are a few little code touch ups for a kdoc complaint,
quicker error detection, and a cleaner initialization.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

+4 -7
+2 -2
drivers/net/ethernet/amd/pds_core/adminq.c
··· 225 225 union pds_core_adminq_comp *comp, 226 226 bool fast_poll) 227 227 { 228 - unsigned long poll_interval = 1; 228 + unsigned long poll_interval = 200; 229 229 unsigned long poll_jiffies; 230 230 unsigned long time_limit; 231 231 unsigned long time_start; ··· 252 252 time_limit = time_start + HZ * pdsc->devcmd_timeout; 253 253 do { 254 254 /* Timeslice the actual wait to catch IO errors etc early */ 255 - poll_jiffies = msecs_to_jiffies(poll_interval); 255 + poll_jiffies = usecs_to_jiffies(poll_interval); 256 256 remaining = wait_for_completion_timeout(wc, poll_jiffies); 257 257 if (remaining) 258 258 break;
+1 -3
drivers/net/ethernet/amd/pds_core/core.c
··· 402 402 403 403 static struct pdsc_viftype pdsc_viftype_defaults[] = { 404 404 [PDS_DEV_TYPE_FWCTL] = { .name = PDS_DEV_TYPE_FWCTL_STR, 405 + .enabled = true, 405 406 .vif_id = PDS_DEV_TYPE_FWCTL, 406 407 .dl_id = -1 }, 407 408 [PDS_DEV_TYPE_VDPA] = { .name = PDS_DEV_TYPE_VDPA_STR, ··· 432 431 433 432 /* See what the Core device has for support */ 434 433 vt_support = !!le16_to_cpu(pdsc->dev_ident.vif_types[vt]); 435 - 436 - if (vt == PDS_DEV_TYPE_FWCTL) 437 - pdsc->viftype_status[vt].enabled = true; 438 434 439 435 dev_dbg(pdsc->dev, "VIF %s is %ssupported\n", 440 436 pdsc->viftype_status[vt].name,
+1 -2
include/linux/pds/pds_adminq.h
··· 4 4 #ifndef _PDS_CORE_ADMINQ_H_ 5 5 #define _PDS_CORE_ADMINQ_H_ 6 6 7 - #define PDSC_ADMINQ_MAX_POLL_INTERVAL 256 7 + #define PDSC_ADMINQ_MAX_POLL_INTERVAL 256000 /* usecs */ 8 8 9 9 enum pds_core_adminq_flags { 10 10 PDS_AQ_FLAG_FASTPOLL = BIT(1), /* completion poll at 1ms */ ··· 463 463 * @rsvd: Word boundary padding 464 464 * @comp_index: Index in the descriptor ring for which this is the completion 465 465 * @state: LIF state (enum pds_core_lif_state) 466 - * @name: LIF name string, 0 terminated 467 466 * @features: Features (enum pds_core_hw_features) 468 467 * @rsvd2: Word boundary padding 469 468 * @color: Color bit